For branch2
test3333
Merge branch 'feature3'

Conflicts:
	WebTestHammer/test_strongconsistency.py