Added functional tests to companies
resolved companies#show issue when company_id does not match table id
Merge branch 'master' of https://github.com/jassicacanidy/CallistoReinvented
Merge branch 'master' of https://github.com/jassicacanidy/CallistoReinvented