fixed validation
Merge branch 'master' into development

Conflicts:
	app/controllers/admin/companies_controller.rb
	app/models/company.rb