Merge branch 'master' into subadmin

3rdparty/Dropbox/API.php

3rdparty/Sabre/DAV/Client.php

apps/bookmarks/appinfo/migrate.php

apps/calendar/appinfo/app.php

apps/calendar/export.php

apps/calendar/js/calendar.js

apps/calendar/js/loader.js

apps/calendar/lib/app.php

apps/calendar/lib/calendar.php

apps/calendar/lib/export.php

apps/calendar/lib/object.php

apps/calendar/lib/repeat.php

apps/calendar/lib/share.php

apps/calendar/share.php

apps/contacts/ajax/contacts.php

apps/contacts/ajax/loadphoto.php

apps/contacts/ajax/uploadimport.php

apps/contacts/appinfo/database.xml

apps/contacts/appinfo/migrate.php

apps/contacts/appinfo/update.php