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
Update the umeng SDK to new version.
make AssetsManagerTest and TestLua run on iOS device
Merge pull request #2486 from minggo/master

fix some bugs
update version
Update the umeng SDK to new version(for iOS)
Merge pull request #2488 from natural-law/master

Update the umeng SDK
update changelog
Merge https://github.com/cocos2d/cocos2d-x
use portrait mode and adjust spaces between labels for umeng xcode project
Merge pull request #2489 from minggo/master

update version and changelog
fix some typos
Merge pull request #2491 from minggo/master

fix some typos
Merge remote-tracking branch 'upstream/master'