Merge pull request #7494 from owncloud/fix-7307

apps/files/js/filelist.js

apps/files/js/files.js

apps/files_sharing/appinfo/routes.php

core/js/core.json

core/js/jquery.avatar.js

core/js/js.js

core/js/router.js

core/js/tags.js

core/js/tests/specHelper.js

core/js/tests/specs/coreSpec.js

core/routes.php

lib/base.php

lib/private/router.php

settings/js/admin.js

settings/js/personal.js

settings/js/users.js

settings/routes.php