TODOs inserted - weren’t included in last commit…
Android test and working on Emulator w. 4.0.3 (maybe former problems were related to bad emulator?). Cosmetic changes implemented to ease transition from Start Trip view to Stop Trip view