EditProfile
true	UserController.java	-/Modified	Commit	src\main\java\YogaStudio\Controller\UserController.java
true	UserDAO.java	-/Modified	Commit	src\main\java\YogaStudio\dao\generic\UserDAO.java
true	UserService.java	-/Modified	Commit	src\main\java\YogaStudio\service\UserService.java
true	editProfile.jsp	-/Modified	Commit	src\main\webapp\WEB-INF\views\user\editProfile.jsp
true	myaccount.jsp	-/Modified	Commit	src\main\webapp\WEB-INF\views\user\myaccount.jsp
Merge origin/master