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

Conflicts:
	src/main/java/id/co/skyforce/shop/controller/ShopController.java