Merge pull request #195 from settinghead/master

Add subcompany bug fix
Merge pull request #197 from settinghead/master

Fix undefined error for userState in company settings modal