Merge branch 'master' into sharing

3rdparty/Sabre/CardDAV/Card.php

3rdparty/Sabre/DAV/Browser/Plugin.php

3rdparty/Sabre/DAV/Server.php

admin/apps.php

admin/css/apps.css

admin/js/apps.js

admin/l10n/xgettextfiles

admin/templates/app.php

admin/templates/app_noconn.php

admin/templates/apps.php

admin/templates/appsinst.php

admin/templates/users.php

apps/contacts/ajax/deletebook.php

apps/contacts/ajax/deleteproperty.php

apps/contacts/ajax/setphoto.php

apps/contacts/ajax/setproperty.php

apps/contacts/ajax/showsetproperty.php

apps/contacts/appinfo/app.php

apps/contacts/appinfo/info.xml

apps/contacts/js/interface.js