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

apps/media/ajax/api.php

apps/media/appinfo/app.php

apps/media/index.php

apps/media/js/collection.js

apps/media/js/music.js

apps/media/js/player.js

apps/media/js/scanner.js

apps/media/lib_scanner.php

apps/media/settings.php

apps/media/templates/collection.php

core/css/styles.css

core/templates/layout.admin.php

core/templates/layout.user.php

core/templates/part.searchbox.php

files/css/files.css

files/js/filelist.js

files/templates/part.list.php

log/appinfo/app.php

log/index.php

log/templates/index.php