Updated edit_company_info.jade with starting values from db
Merge remote-tracking branch 'origin/master'

Conflicts:
	views/company.jade