Diazo enabled bundles
mockupify control panel main actions
mockupify fieldset tabbing
mockupify theme actions
control panel does not need main template
Merge branch 'master' into integrate-theme-editor
add link to return to controlpanel