Merge origin/develop into develop

Conflicts:
	src/java/controller/TrainingController.java
Merge origin/develop into develop