mod
modify
Merge branch 'master' of https://github.com/jxcowork/jxcowork1

Conflicts:
	src/main/webapp/index.html
Fujie
Merge branch 'master' of https://github.com/jxcowork/jxcowork1