register
register
register
Merge origin/master

Conflicts:
	src/main/webapp/login.xhtml
	src/main/webapp/register.xhtml