Check for null focus object
Try to merge using git
Try to merge using git
Flash target needs to use @:getter only, and not override
Merge branch 'master' of https://code.google.com/p/nekonme
Revert "Haxe 3 is required, so clean up the Haxe 3 conditional code"

This reverts commit 5a00a4bc53726d9dbfbc3a9c91a20dae9c973cc9.

Conflicts:
	browser/Lib.hx
	native/display/Stage.hx