Added user validation for company add
resolved conflict with schema.rb
Merge branch 'master' of https://github.com/jassicacanidy/CallistoReinvented
Merge branch 'master' of https://github.com/jassicacanidy/CallistoReinvented