Merge pull request #15314 from owncloud/app-categories-15274

Add different trust levels to AppStore interface

diff --cc config/config.sample.php
Simple merge

diff --cc lib/private/app.php
Simple merge

diff --cc lib/private/server.php
Simple merge

diff --cc settings/application.php
Simple merge

diff --cc settings/css/settings.css
Simple merge

diff --cc settings/routes.php
Simple merge