Company functional
model fix & seed.rb
Merge branch 'dev' into 652_Company_page
fix conflict in  helper
Merge branch 'dev' into 652_Company_page
Merge pull request #21 from is-valid/652_Company_page

652 company page