add show server add host etc
Merge branch 'rc'