Merge origin/master

Conflicts:
	UserInterfaceLayer/web/connexion.xhtml
	UserInterfaceLayer/web/register.xhtml
Merge origin/master