little fix on FlxAnalog for compile errors when FLX_NO_TOUCH specified
put FlxGame on dev branch back
Merge branch 'dev' of github.com:henry-t/HaxeFlixel into dev

Conflicts:
	src/org/flixel/system/input/FlxAnalog.hx
fix conflict in FlxAnalog.hx
Merge branch 'dev' of github.com:henry-t/HaxeFlixel into dev

Conflicts:
	src/org/flixel/FlxGame.hx
	src/org/flixel/system/input/FlxAnalog.hx
fix conflicts