add procractor_conf.js
fixed company override when user accept invite
Merge branch 'master' into bebanjo

* master:
  fixed company override when user accept invite
  add procractor_conf.js

Conflicts:
	app/assets/javascripts/karma.conf.js