调整结构，完善了不少代码。
Merge branch 'master' of https://github.com/fightteam/avalon