Lots of progress on add company validation
Merge remote-tracking branch 'origin/master'

Conflicts:
	views/modals/add_company.jade