bug fix on contactemail when contact is updated
contactemail controller/page: fix issues with primary/existing check. test still pending
renamed variable
Merge commit '2e7daeddb4750772be3afa1bf73093783701f8e9'

Conflicts:
	src/classes/ContactEmailController.cls