Update for HaxeFlixel/flixel#1281
Merge branch 'dev' into FlxNapeSpace

Conflicts:
	Flixel Features/FlxNape/FlxNape.hxproj
	Flixel Features/FlxNape/source/states/Blob.hx
	Flixel Features/FlxNape/source/states/Fight.hx
	Platformers/Mode/Mode.hxproj