EZ to set up cocos2d-x
Merge branch 'David' into Ser
Merge branch 'Ser' into David