首页，查询等界面
root
Merge branch 'master' of https://github.com/leungjianjun/Dota2Trade

Conflicts:
	src/main/webapp/views/addLiterature.vm

addLiterature.vm
Merge branch 'master' of https://github.com/leungjianjun/Dota2Trade

add.