Return escaped HTML for merge shortcode
Merge branch 'accent-control' of github.com:gMagicScott/amazing-system-plugin into accent-control