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.
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
[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
[fixes#77044882] replace disabled css class by attribute so disabled SAVE button on Places page wont be selectable/tabable
[#77046994] overwrite address typeahead input query string otherwise the new value will disappear when the field loses focus
Commiting double-booking fix to v6 and develop
correct tab order on apply and cancel buttons on tralve profile edit page
Partial fix.

Works if year specified on Options is within 1 year.
If no birth year specified and year specified on Review
page is within 1, does not follow up.
[Fixes#72653854]

If no year of birth or if effective age within 1 year, now
asks explicitly if traveller is required age or older.
Merging conguration changes from branch 'v6' into develop
[fixes#77371986] prompt user login page if original request is denied then after logging in need to redirect to original request; in this scenario, only Log In button is presented on sign_in page
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	app/services/eligibility_service.rb
	spec/services/eligibility_service_spec.rb