Merge origin/master

Conflicts:
	src/java/controller/LoginFacade.java
	src/java/controller/ShopFacade.java
	src/java/controller/ShoppingCartFacade.java
	src/java/model/UserInfo.java
	src/java/view/LoginManager.java
	src/java/view/ShopManager.java
	src/java/view/ShoppingCartManager.java
	web/WEB-INF/faces-config.xml
	web/WEB-INF/web.xml
	web/register.xhtml
	web/secured/shopfront.xhtml
Merge origin/master

Conflicts:
	src/java/view/LoginManager.java
Merge origin/master
Merge origin/master
Merge origin/master

Conflicts:
	src/java/view/LoginManager.java