Add mainscene
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_drawnode_prbk

Conflicts:
	cocos/2d/CCDrawNode.cpp
	tests/cpp-tests/Classes/ActionsTest/ActionsTest.cpp
	tests/cpp-tests/Classes/MutiTouchTest/MutiTouchTest.cpp
fix compile error
Merge branch 'ludum-dare' of github.com:minggo/cocos2d-x into ludum-dare
Merge branch 'ludum-dare' of github.com:minggo/cocos2d-x into ludum-dare

Conflicts:
	build/cocos2d_tests.xcodeproj/project.pbxproj
Merge pull request #25 from huangshiwu/ludum-dare

add mainscene