messager beta
Merge branch 'master' of github.com:xinhaoyuan/webds

Conflicts:
	plugins/plugin-messager/main.cpp