Merge origin/master

Conflicts:
	poweryoga/src/main/java/com/saviour/poweryoga/controller/CustomerController.java
	poweryoga/src/main/java/com/saviour/poweryoga/controller/WaiverController.java
	poweryoga/src/main/java/com/saviour/poweryoga/model/Product.java
Merge origin/master