update gems
Merge pull request #454 from cantino/bump_gems

update gems
Merge branch 'master' into scenario-tag-color

Conflicts:
	Gemfile.lock