Changes to the features to fix tests
Merge branch 'master' of https://github.com/stevenarnold/koin

Conflicts:
	Gemfile.lock
	features/step_definitions/administration_steps.rb
	features/step_definitions/file_handling_steps.rb
	features/step_definitions/general_steps.rb
	features/step_definitions/quota_steps.rb