compile bug fix
Merge branch 'master' of https://github.com/HxJointForces/Hxmr

Conflicts:
	src/test/haxe/Main.hx