Deliverable 3 (backend updates)

3.0

Merge branch 'master' of https://github.com/ECSE321-Fall2018/t14

Android Deliverable

Includes logic for everything except modify trip. Other things have database quirks that need to be ironed out