Merge branch 'hotfix/issue_20130326_03' into develop
增加查看显示效果按钮
Merge branch 'release/liuyuan.0.3'