Added 'E-Mail' field to users and groups. Fixed userssync code to use the new fields and improvements on the way we sync empty attributes
Fixed typos
Merge branch 'master' into cperello/s4sync-fixes

Conflicts:
	main/users/ChangeLog
Merge pull request #559 from Zentyal/cperello/s4sync-fixes

Cperello/s4sync fixes
Removed the .pc links to avoid conflicts with distro packages
Fixed bad usage of OpenLDAP when it should be using LDB. Force a trace back printing when an LDB connection is not possible.
Merge pull request #560 from Zentyal/cperello/samba4-packaging-fixes

Removed the .pc links to avoid conflicts with distro packages
Merge branch 'master' into jacalvo/fix-internal-users

Conflicts:
	main/samba/ChangeLog
	main/users/schemas/zentyal.ldif
	main/users/schemas/zentyal.schema