Merge branch 'master' into movable_apps

apps/files/css/files.css

apps/files_sharing/css/sharing.css

apps/media/css/music.css

apps/user_ldap/group_ldap.php

apps/user_ldap/lib_ldap.php

core/css/multiselect.css

core/css/styles.css

lib/base.php

lib/public/util.php

search/css/results.css

settings/css/settings.css