Merge pull request #345 from settinghead/master

Hide shopping cart
separete subcompany modal to its own file