elapsed refactor
Merge branch 'dev' into transitions

Conflicts:
	flixel/addons/ui/FlxUI.hx
	flixel/addons/ui/FlxUIState.hx