Merge branch 'working'

3rdparty/Sabre/VObject/Element/DateTime.php

3rdparty/Sabre/VObject/Element/MultiDateTime.php

3rdparty/XML/RPC.php

apps/bookmarks/ajax/updateList.php

apps/bookmarks/bookmarksHelper.php

apps/calendar/ajax/deleteevent.php

apps/calendar/js/calendar.js

apps/calendar/lib/object.php

apps/calendar/templates/part.editevent.php

apps/calendar/templates/part.eventform.php

apps/contacts/templates/part.addpropertyform.php

apps/contacts/templates/part.details.php

apps/files_publiclink/lib_public.php

apps/files_sharing/get.php

apps/media/ajax/autoupdate.php

apps/media/getID3/getid3/getid3.lib.php

apps/media/lib_ampache.php

apps/media/lib_media.php

apps/media/lib_scanner.php

apps/media/server/xml.server.php