Add locate contact feature
Fix conclicts after merging MH-452 to dev - rebuild travis