basic contactable location
fix edit contactable location
Merge branch 'master' of github.com:Exartu/Exartu-CRM

Conflicts:
	.meteor/packages
	client/lib/customBindings.js
	packages/.gitignore
	smart.json
	smart.lock
Merge branch 'master' of github.com:Exartu/Exartu-CRM

Conflicts:
	smart.json