Migrate from 'composure-hx' to 'composure'
Merge branch 'haxe2' into haxe3