fix
Merge branch 'master' of https://github.com/neversion/es_manager

Conflicts:
	config/environments/development.rb
Merge branch 'master' of https://github.com/neversion/es_manager
Merge branch 'master' of https://github.com/neversion/es_manager
Merge branch 'master' of https://github.com/neversion/es_manager
Merge branch 'master' of https://github.com/neversion/es_manager
Merge branch 'master' of https://github.com/neversion/es_manager
Merge branch 'master' of https://github.com/neversion/es_manager
Merge branch 'master' of https://github.com/neversion/es_manager
Merge branch 'master' of https://github.com/neversion/es_manager
Merge branch 'master' of https://github.com/neversion/es_manager
Merge branch 'master' of https://github.com/neversion/es_manager
Merge branch 'master' of https://github.com/neversion/es_manager
Merge branch 'master' of https://github.com/neversion/es_manager
修改replica设置