Merge branch 'master' into kyle
Addition of swu-linked buttons at top of control panel.
Merge branch 'kyle'