We weren't correctly marking the cancelled ranging after contact list
Time control refactoring
Merge pull request #40 from IanMayo/features/eugene/time-control-refactoring

Time control refactoring - nicely done.
Merge branch 'master' into feature/alex/responsive-game-view

Conflicts:
	www/js/game/controllers/simulator/mission.tpl.html