update for lay out
1. 修正模拟器崩溃的问题。
1. 修复模拟器崩溃。
merge code
Merge pull request #101 from liamcindy/v3_dll

update for lay out
1. 修正合图崩溃bug。
Merge branch 'v3_dll' of https://github.com/chengstory/cocos2d-x into v3_dll
update for lay out
Merge pull request #102 from liamcindy/v3_dll

update for lay out
1. 解决 滚动容器和翻动页面：渐变方向，x=0，y=1时，模拟器和渲染区的效果不一致 的问题。
Merge branch 'v3_dll' of https://github.com/chengstory/cocos2d-x into v3_dll
update for layout and scale9
Merge branch 'v3_dll' of https://github.com/chengstory/cocos2d-x into v3_dll
update for font refresh
fix serialize colorframe error
Merge pull request #104 from geron-cn/originv3

fix serialize colorframe error
Merge pull request #103 from liamcindy/v3_dll

update for layout and scale9
no message
1.  解决32位粒子播放崩溃的问题。
Merge branch 'v3_dll' of https://github.com/chengstory/cocos2d-x into v3_dll

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