Merge branch 'master' into sharing

.gitignore

.htaccess

admin/apps.php

admin/css/users.css

admin/img/administration.png

admin/img/apps.png

admin/img/apps.svg

admin/img/plugins.png

admin/img/users.png

admin/img/users.svg

admin/js/users.js

admin/system.php

admin/templates/users.php

admin/users.php

apps/contacts/appinfo/app.php

apps/contacts/img/icon.png

apps/contacts/templates/part.details.php

apps/contacts/templates/part.property.php

apps/files_publiclink/templates/admin.php

apps/media/appinfo/app.php