Work on add email popup, refs #6575
Changing activity to N/A, fixes #6672
Adding a contact without email address doesn't automatically assign other messages, fixes #6674
Check for null, fixes #6674
Add email to record popup box, fixes #6675
Merge branch 'dev' into test