Merge branch 'hotfix/hotfix-mainFormBugs' into develop
Merge branch 'develop' of git.oschina.net:cuibty/gitdemo