Merge branch 'master' into subadmin

apps/contacts/ajax/activation.php

apps/contacts/ajax/addaddressbook.php

apps/contacts/ajax/addcontact.php

apps/contacts/ajax/addproperty.php

apps/contacts/ajax/categories/categoriesfor.php

apps/contacts/ajax/categories/delete.php

apps/contacts/ajax/contactdetails.php

apps/contacts/ajax/createaddressbook.php

apps/contacts/ajax/currentphoto.php

apps/contacts/ajax/deletecard.php

apps/contacts/ajax/deleteproperty.php

apps/contacts/ajax/editaddress.php

apps/contacts/ajax/editname.php

apps/contacts/ajax/loadcard.php

apps/contacts/ajax/loadintro.php

apps/contacts/ajax/loadphoto.php

apps/contacts/ajax/loghandler.php

apps/contacts/ajax/oc_photo.php

apps/contacts/ajax/savecrop.php

apps/contacts/ajax/saveproperty.php