merge master into interface

apps/files_imageviewer/appinfo/app.php

apps/files_imageviewer/appinfo/info.xml

apps/media/ajax/api.php

apps/media/css/player.css

apps/media/js/Jplayer.swf

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

apps/media/js/player.js

apps/media/lib_collection.php

apps/media/templates/player.php

core/js/js.js

l10n/l10n.pl

l10n/templates/admin.pot

l10n/templates/core.pot

l10n/templates/help.pot

l10n/templates/log.pot

l10n/templates/settings.pot