Merge branch 'master' into tasks

apps/calendar/ajax/editevent.php

apps/calendar/ajax/editeventform.php

apps/calendar/ajax/events.php

apps/calendar/ajax/moveevent.php

apps/calendar/lib/object.php

apps/contacts/ajax/addcard.php

apps/contacts/ajax/addproperty.php

apps/contacts/ajax/deletebook.php

apps/contacts/ajax/deletecard.php

apps/contacts/ajax/deleteproperty.php

apps/contacts/ajax/getdetails.php

apps/contacts/ajax/setproperty.php

apps/contacts/ajax/showaddcard.php

apps/contacts/ajax/showaddproperty.php

apps/contacts/ajax/showsetproperty.php

apps/contacts/appinfo/app.php

apps/contacts/index.php

apps/contacts/lib/app.php

apps/contacts/lib/vcard.php

apps/contacts/photo.php