Merge branch 'kyle'
Added dashboard button to control panel.
Merge branch 'master' into kyle