Changes to haxelib scripts
Merge branch 'haxe2' into haxe3

Conflicts:
	src/haxelib.xml