Merge pull request #193 from 2betop/dev

Dev
Merge pull request #195 from 2betop/dev

fix input button property issue.
Merge remote-tracking branch 'upstream/dev' into dev
添加群三