add error message in register.jsp
merge issue
Merge branch 'master' of https://github.com/synnack/nl.hva.dle2014.groep8

Conflicts:
	web/WEB-INF/view/unauth/register.jsp