Merge branch 'issue_59_bug_fix' into dev

This commit is contained in:
liuzheng712 2016-02-26 10:53:29 +08:00
commit 14a0c1871f

File diff suppressed because it is too large Load Diff