[OE-2595] unfinished work on user<>site/firm selection process
[OE-2595] firm selection nag screen and user profile page.
Merge branch 'jira/2595' into develop