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

Nico branch
android 3.6 tabs possible solution
Merge branch 'master' of https://github.com/SCS-hackers-group/Concordia-Shuttle-Bus-App into nico_branch