NO-99: Rename page id to refect their job.
Merge branch 'master' into refactor/rename-page-id

Conflicts:
	src/test/browsertest/participant_test.js
NO-99: Fix for last commit.
Merge pull request #1 from huskycode/refactor/rename-page-id

Refactor/rename page