Updated TODO message
Added return statements after done calls
Merge branch 'master' into game-validation

Conflicts:
	views/game/board.js