save company primary uploader button + defaults in contacts fields
Merge remote-tracking branch 'master/master'