Don't replace '$' at last position in class names
Update genjava.ml
Merge branch 'scala-singleton' of github.com:Atry/haxe-1 into qifun

Conflicts:
	genjava.ml