Merge origin/master

Conflicts:
	build/generated-sources/ap-source-output/entities/Account_.java
	build/generated-sources/ap-source-output/entities/Address_.java
	build/generated-sources/ap-source-output/entities/Affiliate_.java
	build/generated-sources/ap-source-output/entities/Category_.java
	build/generated-sources/ap-source-output/entities/Customer_.java
	build/generated-sources/ap-source-output/entities/LineItem_.java
	build/generated-sources/ap-source-output/entities/Order_.java
	build/generated-sources/ap-source-output/entities/Product_.java
	build/generated-sources/ap-source-output/entities/ShoppingCart_.java
	build/generated-sources/ap-source-output/entities/WebUser_.java
	build/web/WEB-INF/classes/Bundle.properties
	build/web/WEB-INF/faces-config.xml
	build/web/WEB-INF/sun-web.xml
	build/web/category/ViewProduct.xhtml
	build/web/commonHeader.html
	build/web/home.html
	build/web/home.xhtml
	build/web/index.xhtml
	build/web/lineItem/Create.xhtml
	build/web/lineItem/Edit.xhtml
	build/web/lineItem/List.xhtml
	build/web/lineItem/View.xhtml
	build/web/product/List.xhtml
	build/web/shoppingCart/List.xhtml
	build/web/template.xhtml
	nbproject/build-impl.xml
	nbproject/genfiles.properties
	nbproject/private/private.properties
	nbproject/private/private.xml
	nbproject/project.properties
	nbproject/project.xml
	src/conf/persistence.xml
	src/java/Boundary/AbstractFacade.java
	src/java/Boundary/WebUserFacade.java
	src/java/Bundle.properties
	src/java/entities/Account.java
	src/java/entities/Customer.java
	src/java/entities/LineItem.java
	src/java/entities/Order.java
	src/java/entities/ShoppingCart.java
	src/java/entities/WebUser.java
	src/java/presentation/AccountController.java
	src/java/presentation/CategoryController.java
	src/java/presentation/CustomerController.java
	src/java/presentation/OrderController.java
	src/java/presentation/ProductController.java
	src/java/presentation/ShoppingCartController.java
	src/java/presentation/WebUserController.java
	web/WEB-INF/faces-config.xml
	web/category/ViewProduct.xhtml
	web/commonHeader.html
	web/home.html
	web/home.xhtml
	web/index.xhtml
	web/lineItem/Create.xhtml
	web/lineItem/Edit.xhtml
	web/lineItem/List.xhtml
	web/lineItem/View.xhtml
	web/product/List.xhtml
	web/shoppingCart/List.xhtml
	web/template.xhtml