Improve the engine to support GameEngine
Fix typo
Merge pull request #2512 from pandamicro/next

Improve the engine to support GameEngine