Merge origin/master

Conflicts:
	poweryoga/src/main/java/com/saviour/poweryoga/controller/UserController.java
Merge origin/master