Merge branch 'master' of https://github.com/bustanil/onlineshop.git

Conflicts:
	src/main/java/id/co/skyforce/shop/controller/ShopController.java
fs
CustomerController part1
Merge branch 'master' of https://github.com/bustanil/onlineshop.git

Conflicts:
	src/main/java/id/co/skyforce/shop/controller/ProductController.java
	src/main/java/id/co/skyforce/shop/controller/ProductListController.java
	src/main/java/id/co/skyforce/shop/service/ProductListService.java
	src/main/webapp/product/list.xhtml
Merge branch 'master' of https://github.com/bustanil/onlineshop.git

Conflicts:
	src/main/webapp/product/list.xhtml