Merge origin/master

Conflicts:
	oak_yoga_studio/src/main/java/com/oak_yoga_studio/dao/impl/CourseDAOImpl.java
Merge origin/master