Forgotten commit
Controller UI behaviour (in progress)
Merge branch 'master' of https://github.com/BusTrack/bustrack
Controller UI behaviour (in progress)