Merge remote-tracking branch 'cocos/develop' into develop
add resouce folder definition on linux
Merge pull request #2 from cocos2d/develop

dd
Update CMakeLists.txt
Merge pull request #1090 from joshuastray/fix-color-picker-crash

Fix color picker crash