updates for filters in user grid
Updated contacts to use modals
Added USA as default
added missing migrations.  Moved FixedAsset and Facility to erp_base_erp_svcs
removed mobile knitkit site
Merge remote-tracking branch 'origin/master' into bootstrap

Conflicts:
	erp_app/public/javascripts/erp_app/shared/crm/ContactMechanismGrid.js