Merge branch 'master', remote branch 'origin' into development
add options to replace server config
Merge pull request #6 from deyunanhai/development

Development