gemfile update
Merge branch 'master' of github.com:wmde/fundraising-bannertests

Conflicts:
	Gemfile.lock
rubycop auto-corrections