last minute fix
Merge branch 'stl-cocos2d-x-3.0' of github.com:ShortTailLab/cocos2d-x into stl-cocos2d-x-3.0