apply changes
modify contact
Merge branch 'dev' into 624_N
Company functional
created view/contract/new && ctrls/cotract_ctrl
fixx conflicts
model fix & seed.rb
Merge branch 'dev' into 652_Company_page
rm empty helpers
Merge pull request #22 from is-valid/660_rm_empty_helpers

rm empty helpers
Merge pull request #23 from is-valid/656_Contact_some_f(x)

656 contact some f(x)
fix conflict in  helper
Merge branch 'dev' into 652_Company_page
Merge pull request #21 from is-valid/652_Company_page

652 company page
fix acteve admin
fixed category and fixed comment
Merge branch 'dev' into 624_N
Merge pull request #24 from is-valid/624_N

624 n
Merge pull request #25 from is-valid/652_Company_page

fix acteve admin
After merge from dev - deleted helpers