set design resolution  for WatermelonWithme
include cocos2d.h to make android template work
Merge https://github.com/cocos2d/cocos2d-x
Merge https://github.com/cocos2d/cocos2d-x
Merge https://github.com/cocos2d/cocos2d-x
make AssetsManagerTest and TestLua run on iOS device
Merge pull request #2486 from minggo/master

fix some bugs