Add register
Merge branch 'master' of https://github.com/Chisci/QcmManager

Conflicts:
	src/main/webapp/WEB-INF/pages/welcome.jsp
Merge branch 'master' of https://github.com/Chisci/QcmManager