rollback for Demo (all in show-case)
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	browser-test/pom.xml
rollback for Demo (all in show-case)