Merge branch 'master' of https://github.com/tao-zeng/jucp.git

Conflicts:
	web/core/src/main/webapp/index.jsp
	web/core/src/main/webapp/scripts/main.js
Merge remote-tracking branch 'origin/master'