fixed bugs
reset
Merge branch 'master' of https://github.com/zhongyitech/wffa.git
merge again