fix compilation in ClientController
Merge branch 'master' of github.com:chpatton013/clue

Conflicts:
	Indication/src/client/ClientController.java