Reset Gemfile.lock for desktop mode, so travis doesn't fail.
Merge branch 'v6' into develop
Update Travis to only build v6 and not develop.
bundle install for UI_MODE=kiosk.
Merging v6 into Develop prior to relase of 0.6.5
Update Version to 0.6.5
Update Travis to only build for develop
Merge branch 'v6' into develop
fix kiosk locations in seed file
Merge remote-tracking branch 'upstream/v6-kiosk' into develop

Conflicts:
	db/seeds.rb
Fix 500 error while planning a trip to a city (not an address)
Fix PA footer
Merge branch 'trip-500-error' into fix-pa-print-footer
display old message if not PA
Fix different format for ecolane booking
some fixes for trip card details
Merge branches '296-trip-details', 'ecolane-button-fixes' and 'fix-pa-print-footer' into round1-critical
[fixes#77047148] remove tabindex config from user profile
[#77042268] replace %btn by %button to enable tabable on these buttons, plus put preventDefault on button click event to avoid page refresh
[fixes#77046994] enable SPACE bar selection on place record in order to edit it on Places page