update message server setup in doc
merge master