true	EmailAdvice.java	-/Modified	Commit	src\main\java\YogaStudio\service\EmailAdvice.java
true	rootconfig.xml	-/Modified	Commit	src\main\webapp\WEB-INF\rootconfig.xml
Merge origin/master