More registration modifications
Merge branch 'master' of github.com:Indiv0/insight-web

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