Merge origin/master

Conflicts:
	src/main/webapp/Presentation/UserRegistration.xhtml