Merge branch 'dev' of https://github.com/HaxeFlixel/flixel into dev

Conflicts:
	include.xml