cocos2d/cocos2d-x — pull request #2486 by minggo (2013-04-28 03:21:41+00:00)
Title: fix some bugs

1. set design resolution for WatermelonWithme
2. include cocos2d.h in main.cpp to make android template work
3. make AssetsManagerTest and TestLua run on iOS device