Merge origin/master

Conflicts:
	oak_yoga_studio/src/main/webapp/WEB-INF/springconfig.xml
	oak_yoga_studio/src/main/webapp/WEB-INF/views/about.jsp
	oak_yoga_studio/src/main/webapp/WEB-INF/views/contact.jsp
	oak_yoga_studio/src/main/webapp/WEB-INF/views/sectionList.jsp
Merge origin/master