Upgrading dependencies
Minor bump in dependencies
Merge branch 'develop'

Conflicts:
	Gemfile.lock
	lib/qme/version.rb
	test/test_helper.rb