Merge origin/master

Conflicts:
	src/main/java/YogaStudio/domain/SectionEntity.java
Merge origin/master