Merge branch 'master' into subadmin

apps/calendar/ajax/calendar/activation.php

apps/calendar/ajax/calendar/delete.php

apps/calendar/ajax/calendar/new.php

apps/calendar/ajax/calendar/update.php

apps/calendar/ajax/categories/rescan.php

apps/calendar/ajax/event/delete.php

apps/calendar/ajax/event/edit.php

apps/calendar/ajax/event/move.php

apps/calendar/ajax/event/new.php

apps/calendar/ajax/event/resize.php

apps/calendar/ajax/import/import.php

apps/calendar/ajax/settings/setfirstday.php

apps/calendar/ajax/settings/settimeformat.php

apps/calendar/ajax/settings/settimezone.php

apps/calendar/appinfo/app.php

apps/calendar/lib/hooks.php

apps/calendar/templates/calendar.php

apps/contacts/ajax/categories/delete.php

apps/contacts/ajax/categories/rescan.php

apps/contacts/ajax/contactdetails.php