Fix travis test errors
Fix travis test errors
Fix travis test errors
Fix bad data in follow up comment upon adding a new contact
Merge branch 'MH-612' into dev