fix current location
Fix for final screen breaking.
translate questions
kiosk gemfile
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
Fixes formatting error message
Fix issue with overview screen
fix issues with final screen
Merge branch '273-pass-eligibility-question-text-through-i18n-process' into fixes

Conflicts:
	Gemfile.lock
add kiosk location for York
debug
int or integer
add translated trip purpose
Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'upstream/develop' into develop
Fix issues with trip final screen and print
Merge pull request #136 from CG-CamSys/281-trip-selection-and-printing-issues

Fix issues with trip final screen and print