Revert "Merge branch 'experimental' of https://github.com/HaxeFlixel/flixel into experimental"

This reverts commit ea0c7c0bcd901afb1766c8f0eaf58e43ddedbcf9, reversing
changes made to 5a1503ca00e410df1bad6c3cb6c137b33f090265.
Undoing bad merge. Adding Gamma's changes to include.xml [fe7ba215402c5ac2862540d9488eff600886e530]
Merge branch 'dev' of https://github.com/HaxeFlixel/flixel into dev

Conflicts:
	flixel/FlxBasic.hx
	flixel/FlxCamera.hx
	flixel/FlxGame.hx
	flixel/FlxObject.hx
	flixel/FlxSprite.hx
	flixel/FlxState.hx
	flixel/FlxSubState.hx
	flixel/effects/particles/FlxParticle.hx
	flixel/effects/particles/FlxTypedEmitter.hx
	flixel/effects/particles/FlxTypedEmitterExt.hx
	flixel/group/FlxTypedGroup.hx
	flixel/plugin/TimerManager.hx
	flixel/system/FlxList.hx
	flixel/system/debug/Console.hx
	flixel/system/debug/ConsoleCommands.hx
	flixel/system/debug/Log.hx
	flixel/system/debug/Perf.hx
	flixel/system/debug/Watch.hx
	flixel/system/debug/WatchEntry.hx
	flixel/system/debug/Window.hx
	flixel/system/input/FlxInputStates.hx
	flixel/system/input/FlxJoystickManager.hx
	flixel/system/input/FlxMouse.hx
	flixel/system/input/FlxTouch.hx
	flixel/system/layer/TileSheetData.hx
	flixel/system/layer/frames/FlxFrame.hx
	flixel/system/layer/frames/FlxSpriteFrames.hx
	flixel/text/FlxBitmapTextField.hx
	flixel/text/FlxText.hx
	flixel/text/FlxTextField.hx
	flixel/tile/FlxTileblock.hx
	flixel/tile/FlxTilemap.hx
	flixel/tweens/motion/Motion.hx
	flixel/ui/FlxBar.hx
	flixel/ui/FlxTypedButton.hx
	flixel/util/FlxPath.hx
	flixel/util/FlxSave.hx
	include.xml
	src/org/flixel/system/layer/Atlas.hx
	src/org/flixel/system/layer/Node.hx