Web pages
Merge branch 'master' of https://github.com/erosnick/cocos2d-x-study