fix current location
Fix for final screen breaking.
Merge branches '275-stack-trace-shown-when-selecting-a-trip-on-the-final-screen' and '270-start-from-current-location-doesn-t-work' into HEAD
prep gemfile.lock for kiosk
fix missing partial error
Fix issues with CanCan and kiosk code