Can now see active measures in the text bar
Merge branch 'dev' of https://github.com/Cholera-Infrastructure-Game/CholeraGame into dev

Conflicts:
	src/game/village.js