Small bug fixes
Merge branch 'dev' of ssh://git@github.com/CSc436/Project-4x.git into
dev

Sorry guys, made some changes in dev by accident. Won't happen again!

Conflicts:
	src/com/client/model/ClientModel.java
	war/game/compilation-mappings.txt
	war/game/game.nocache.js