panelManger
Merging origin/john/master-pending-panelManager into master