Added contact and location info
Merge branch 'dev'