Updated gems
Merge branch 'master' of github.com:progress-engine/volunteer

Conflicts:
	Gemfile.lock