Merge branch 'master' into calendar

apps/contacts/templates/index.php

apps/files_sharing/sharedstorage.php

apps/gallery/css/styles.css

apps/gallery/lib/scanner.php

apps/media/js/jQuery.jPlayer.2.1.0.source/Jplayer.as

apps/media/js/jQuery.jPlayer.2.1.0.source/Jplayer.fla

...js/jQuery.jPlayer.2.1.0.source/add-on/jplayer.playlist.js

...y.jPlayer.2.1.0.source/add-on/jquery.jplayer.inspector.js

...ry.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerEvent.as

...uery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerMp3.as

...uery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerMp4.as

...y.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerStatus.as

apps/media/js/jQuery.jPlayer.2.1.0.source/jquery.jplayer.js

core/js/jquery.infieldlabel.js

files/ajax/move.php

lib/filestorage/local.php

lib/filesystem.php

lib/util.php