Merge origin/master

Conflicts:
	oak_yoga_studio/src/main/java/com/oak_yoga_studio/controller/CustomerController.java
	oak_yoga_studio/src/main/java/com/oak_yoga_studio/dao/CustomerDAO.java
	oak_yoga_studio/src/main/java/com/oak_yoga_studio/dao/impl/CustomerDAOImpl.java
	oak_yoga_studio/src/main/java/com/oak_yoga_studio/service/ICustomerService.java
	oak_yoga_studio/src/main/java/com/oak_yoga_studio/service/impl/CustomerServiceImpl.java
	oak_yoga_studio/src/main/webapp/WEB-INF/views/productList.jsp
Merge origin/master
css