server change and some config changes
Merge branch 'master' of github.com:bbttxu/cbs