Merge branch 'master' of github.com:loomio/loomio into refactor/discussion-controller

* 'master' of github.com:loomio/loomio:
  Downgrade webmock
  Improve speed of tests.

Conflicts:
	Gemfile
	Gemfile.lock