[java/cs] fix String#toString()
Merge branch 'development' of https://github.com/HaxeFoundation/haxe into development
[java] naming conflict
Merge branch 'development' of https://github.com/HaxeFoundation/haxe into development