Merge pull request #15 from allenjohn/master

增加武将是否可交易
Merge pull request #16 from allenjohn/master

文件遗漏
Merge pull request #17 from allenjohn/master

blood更改为trade
Merge pull request #18 from allenjohn/master

建筑概述&资源概述//当前武将生命值统计
Merge pull request #19 from jeff5665/dev_tutorial

与dev_tutorial合并
更新package.json版本
Merge remote-tracking branch 'origin/dev_tutorial' into dev_tutorial_v0.16
Merge pull request #21 from jeff5665/dev_tutorial

再次与dev_tutorial合并
ALLEN_MASTER
merage
merage
Merge branch 'allenjohn-master'
bug fix
Merge pull request #31 from jeff5665/master

Merge branch 'allenjohn-master'
Merge pull request #32 from jeff5665/allen_master

Merge pull request #31 from jeff5665/master
Merge allen_master
Merge pull request #35 from allenjohn/master

更改版本号
解决文件中的为点掉的<<<< >>>>
增加帐号TAB
新手任务开始，第一步新开帐号（未完成）