Merge branch 'hotfix/0.3.1'
fixing test page path
Merge branch 'hotfix/0.3.2' into develop

Conflicts:
	package.json