Merge origin/develop into develop

Conflicts:
	src/java/models/managers/TrainingManager.java