Do not set selected company until cid in the URL is parsed

Fix for https://github.com/Rise-Vision/common-header/issues/417

- Also combine server-watch and server
Merge pull request #419 from settinghead/master

Do not set selected company until cid in the URL is parsed