SWITCH TO ANOTHER PROJECT
Merge branch 'dev' into 667_role_admin_user

Conflicts:
	app/controllers/posts_controller.rb
	app/controllers/team_controller.rb
	test/controllers/careers_controller_test.rb
	test/controllers/comments_controller_test.rb
	test/controllers/company_controller_test.rb
	test/controllers/contact_controller_test.rb
	test/controllers/home_controller_test.rb
	test/controllers/posts_controller_test.rb
	test/controllers/work_controller_test.rb
pofixite migracii admin_name,admin_last_name - delete nuzhen
ok