Merge pull request #2 from One-Platform/master

Merge pull request #7 from zhangfanba/master
Merge pull request #3 from One-Platform/master

download html模板
修改配置文件，使项目可启动
修改配置文件
Merge pull request #10 from zhangfanba/master

修改配置文件，使项目正常启动
Merge branch 'One-Platform-master'

Conflicts:
	showcase/src/main/webapp/WEB-INF/web.xml