Minor changes.
Added Management Server
Merge branch 'tp'