Adding uncommitted changes
Merge branch 'dev' of http://www.github.com/HaxeFlixel/flixel-editors into dev