Added user preference activity
merging changes from master
Merge branch 'master' of https://github.com/SCS-hackers-group/Concordia-Shuttle-Bus-App into annie
Merge pull request #8 from SCS-hackers-group/annie

Annie