edit company form preprocess
Merge remote-tracking branch 'master/master'

Conflicts:
	public/backbone/config.js