finished making contact_purpose a configuration option
Merge remote-tracking branch 'origin/master' into bootstrap

Conflicts:
	erp_app/public/javascripts/erp_app/organizer/applications/crm/base.js
	erp_app/public/javascripts/erp_app/shared/crm/PartyGrid.js
	erp_tech_svcs/erp_tech_svcs.gemspec