Merge branch 'master' of git://anongit.kde.org/owncloud

admin/appinfo/app.php

admin/apps.php

admin/system.php

admin/users.php

apps/files_publiclink/appinfo/app.php

apps/media/css/music.css

apps/media/css/player.css

apps/media/index.php

apps/media/js/settings.js

apps/media/templates/collection.php

apps/media/templates/music.php

apps/media/templates/player.php

apps/media/templates/playlist.php

apps/media/templates/settings.php

apps/user_ldap/appinfo/app.php

core/css/styles.css

core/js/setup.js

core/templates/installation.php

core/templates/layout.admin.php

core/templates/layout.user.php