Merge branch 'dev' into 630-Feature
end day
first commit
Merge branch 'dev' into 654_N
Merge branch 'dev' into 630-Feature
Merge branch 'dev' into 654_N

Conflicts:
	db/schema.rb
before merge
temp commit
Merge branch 'dev' into 654_N
Merge branch 'dev' into 664_Test_all
merge with dev, fix adminuserimg
Start testing contact
Merge branch 'dev' into 630-Feature
finish test post_Ctrl && modify post.show.html
and day, team inprogress
Tests for Contact view and controller
Add test home_Ctrl && modify factories project, technology
test Company_Ctrl
img fix, team content add
Tests finished for Contact controller and view