Merge pull request #107 from thelabtech/MH-452

Add locate contact feature
Fix add contact form
Fix conflicts after merging MH-612 to dev