Merge branch 'master' of https://github.com/chrstein/x3dom-testing

Conflicts:
	test/functional/helloX3DWorld.xhtml