Merge pull request #36 from samuele3hu/tip_generator

close #4284:testlua TilemapTest->TMX Ortho vertexZ test, the sprite doesn't hide behind the trees.
Update the submodule about `cocos2d-x`
Merge branch 'master' of https://github.com/cocos2d/cocos2d-lua into tip_generator