changes to ClientController.java
Merge branch 'Beautification' of github.com:erik-helleren/bar-bot-client into Beautification

Conflicts:
	bar-bot-client/src/org/ClientController.java