Cleanup for Color Swatch stuff
Merge branch 'dev' of https://github.com/HaxeFlixel/flixel-ui into dev