Updated config file after change in upstream

We need the full email address to login against our Dovecot
Re-added username extraction from mail address for carddav
CardDAV login opearation will always succeed

We are checking user credentials against IMAP and CalDAV.
Users configured with username and not-username@domain.lan will be able to
login.
We this "cheat" we allow those users to use calendaring and mailing.
Added a warning log line when carddav logon fails
Added PHP IMAP library to PHP client so z-push-admin can be launched
Apache2 is not longer managed by zentyal webserver
Merge pull request #5 from Zentyal/mjulian/login-after-merge-upstream

Mjulian/login after merge upstream