marge xiao to dev branch
增加了代码规范及git使用规范并修复了一个bug
Merge branch 'development' into xiao