Added MessageServer in admin site
Merge remote-tracking branch 'origin/new_ui' into new_ui