Merge branch 'master' of ssh://git@github.com/hongdong/taupst_server.git
Merge branch 'master' of ssh://git@github.com/hongdong/taupst_server.git

Signed-off-by: caiz <fjcaiz007@sina.com>