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

admin/appinfo/app.php

apps/files_imageviewer/js/lightbox.js

apps/files_publiclink/templates/admin.php

apps/media/ajax/api.php

apps/media/appinfo/app.php

apps/media/appinfo/database.xml

apps/media/css/player.css

apps/media/img/media.png

apps/media/js/Jplayer.swf

apps/media/js/files.js

apps/media/js/jquery.jplayer.min.js

apps/media/js/player.js

apps/media/lib_collection.php

apps/media/lib_scanner.php

apps/media/templates/player.php

apps/user_openid/phpmyid.php

core/css/styles.css

core/img/actions/back.png

core/img/actions/back.svg

core/img/actions/delete.png