trying fix knockout package
Merge branch 'master' of github.com:Exartu/Exartu-CRM

Conflicts:
	client/collections.js
fix a merge problem in add contactable