Make submit buttons more uniform.
Show Company name for external entries.
Add additional external contact fields.
Merge branch 'release/12.0' into develop

Conflicts:
	Contactmanager.class.php