Merge branch 'arctouch_review' of
https://github.com/pedro1412/busroutesapp.git into arctouch_review
Merge branch 'arctouch_review' of https://github.com/pedro1412/busroutesapp into arctouch_review