Merge pull request #24 from SCS-hackers-group/nico_branch

Nico branch
added case returning to the first tab (which was just undefined in the listener)
Merge branch 'master' of https://github.com/SCS-hackers-group/Concordia-Shuttle-Bus-App into nico_branch