1. fixes windows build error.
1.  Update protobuf.
remove colorframe's cascade set
Merge pull request #82 from geron-cn/v3_dll

remove colorframe's cascade set
Merge branch 'v3_dll' of https://github.com/chengstory/cocos2d-x into v3_dll
Merge branch 'v3_dll' of github.com:xiexin36/cocos2d-x into v3_dll

Conflicts:
	cocos/editor-support/cocostudio/CSParseBinary.pb.cc
	cocos/editor-support/cocostudio/CSParseBinary.pb.h