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