added ability to pass additional columns to UsersGrid
Merge branch 'master' of github.com:portablemind/compass_agile_enterprise
Merge remote-tracking branch 'origin/master' into bootstrap

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