Added new company module
Merge branch 'master' into development

Conflicts:
	app/controllers/admin/companies_controller.rb
	config/locales/en.yml