Company admin added
Merge branch 'master' into development

Conflicts:
	app/controllers/admin/companies_controller.rb
	config/locales/en.yml
company language added
Merge branch 'master' into development

Conflicts:
	app/controllers/admin/companies_controller.rb
	app/models/company.rb
password field enabled for company admin
Merge branch 'master' into development

Conflicts:
	app/models/company.rb
	config/routes.rb
	db/schema.rb
fixed search and sort issues
search changes