All is working! [KFSQA-1014]
Merge branch 'master' into KFSQA-1014

Conflicts:
	features/step_definitions/routing.rb
	features/vendor/vendor_edit.feature
[KFSQA-1038] merge from master