update mysql2 version
Merge branch 'rm_production' into wip-open

Conflicts:
	Gemfile