Move company to subcompany when a subcompany is selected

Fix for https://github.com/Rise-Vision/common-header/issues/205
Merge remote-tracking branch 'upstream/master'
Merge pull request #225 from settinghead/master

Move company to subcompany when a subcompany is selected