Updated Controller behaviour
Merge branch 'master' of https://github.com/BusTrack/bustrack

Conflicts:
	client/bustrackwindow.cpp
	client/bustrackwindow.h