Chat and GameLog Functional

Fixed issue of casting player’s name received in json from server to
the players CatanColor used by the ChatView and GameCommandsView
Merge branch 'master' of https://github.com/Chad-Barlow/CS340

Conflicts:
	Catan/java/src/client/communication/ChatController.java