Merge pull request #10 from qatang/dev

merge dev
test index.jsp
Merge branch 'JSHgithub-master' into dev
Merge branch 'dev' of https://github.com/qatang/cms into dev

Conflicts:
	src/main/webapp/index.jsp