not needed anymore
Merge branch 'master' into multiple_bank_accounts

Conflicts:
	app/controllers/companies_controller.rb