bundle update
Merge branch 'master' into bootstrap

Conflicts:
	Gemfile.lock