[shortcodes] building panel shortcodes
merge conflicts
Merge pull request #103 from fiftyandfiftyorg/th-updates

Th updates