merge master into interface

admin/appinfo/app.php

admin/apps.php

apps/media/appinfo/app.php

apps/media/css/jplayer.css

apps/media/css/music.css

apps/media/css/player.css

apps/media/css/style.css

apps/media/index.php

apps/media/js/files.js

apps/media/js/music.js

apps/media/js/player.js

apps/media/templates/music.php

apps/media/templates/player.php

core/css/jquery-ui-1.8.14.custom.css

core/js/jquery-1.5.min.js

core/js/jquery-1.6.2.min.js

core/js/jquery-ui-1.8.14.custom.min.js

core/js/js.js

files/js/files.js

l10n/templates/admin.pot