issue #2905:make cocostudio and gui flat
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2905-adjust_folder
Merge pull request #3954 from minggo/iss2905-adjust_folder

Iss2905 adjust folder