Ready for M10 demo
Merge origin/master

Conflicts:
	src/controllers/EncounterFactory.java
Merge origin/master

Conflicts:
	src/controllers/EncounterFactory.java