Merge origin/master

Conflicts:
	src/main/webapp/user/Create.xhtml