test init
Merge branch 'master' into zmzment2

Conflicts:
	test/src/TestMain.java