Minor Changes to UI and Controller

Changes to code to ensure that the integration works
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/Controller.class
	bin/UI.class