don't upgrade capybara, causes failing features #3441
Merge branch '3441_surveyor_translations' of https://github.com/NUBIC/ncs_navigator_core into 3441_surveyor_translations

Conflicts:
	Gemfile.lock