Merge pull request #225 from settinghead/master

Move company to subcompany when a subcompany is selected
fix for #158
Merge pull request #233 from settinghead/master

uiState manager now accepts only one state attempt at a time
Merge pull request #232 from Rise-Vision/issues/issue-158-user-settings-not-populated-for-inactive-user

fix for #158
Follow up for for #158
Merge pull request #235 from Rise-Vision/issues/issue-158-user-settings-not-populated-for-inactive-user

Follow up for for #158
Merge pull request #236 from settinghead/master

Signs user out when the user deletes his own company
Merge pull request #239 from settinghead/master

fix jquery path that causes E2E errors
Merge pull request #241 from settinghead/master

honour rv-cid param in URL and switch company when appropriate
Merge remote-tracking branch 'upstream/master'

Conflicts:
	dist/js/common-header.js
	src/js/controllers/ctr-user-settings-modal.js