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

Conflicts:
	src/main/java/id/co/skyforce/shop/controller/LoginController.java
	src/main/java/id/co/skyforce/shop/service/CustomerService.java
	src/main/java/id/co/skyforce/shop/service/LoginService.java
Merge branch 'master' of https://github.com/bustanil/onlineshop.git

Conflicts:
	src/main/java/id/co/skyforce/shop/controller/LoginController.java
	src/main/java/id/co/skyforce/shop/service/CustomerService.java
	src/main/java/id/co/skyforce/shop/service/LoginService.java
Merge branch 'master' of https://github.com/bustanil/onlineshop.git

Conflicts:
	src/main/java/id/co/skyforce/shop/controller/LoginController.java
	src/main/java/id/co/skyforce/shop/service/LoginService.java
	src/main/webapp/user/login.xhtml
24 Oktober 2014 bagian 1