Merge origin/6_Arno

Conflicts:
	web/connect.xhtml
	web/user/checkout.xhtml
	web/user/myAccountIndex.xhtml
	web/user/myAccountOrdersList.xhtml