Order commit
Order commit with your commit too
Order commit with your commit too
Merge origin/master

Conflicts:
	poweryoga/src/main/java/com/saviour/poweryoga/controller/CustomerController.java
	poweryoga/src/main/java/com/saviour/poweryoga/serviceImpl/UserService.java
Merge origin/master

Conflicts:
	poweryoga/src/main/java/com/saviour/poweryoga/controller/CustomerController.java
	poweryoga/src/main/java/com/saviour/poweryoga/serviceImpl/UserService.java