Merge branch 'dev' into 630-Feature
end day
Merge branch 'dev' into 630-Feature
before merge
merge with dev, fix adminuserimg
Start testing contact
Merge branch 'dev' into 630-Feature
and day, team inprogress
Tests for Contact view and controller
img fix, team content add
Tests finished for Contact controller and view
Removed commented text
Merge pull request #53 from is-valid/630-Feature

630 feature
as
merge with dev
SWITCH TO ANOTHER PROJECT
fix errors
Merge pull request #54 from is-valid/yar

Yar
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