升级Rails同时配置Mina
Merge branch 'feature/mina' into develop

Conflicts:
	Gemfile
	Gemfile.lock