WIP Shortcode
Merge pull request #184 from GrabNetworks/layout-cs

Layout cs Merge conflict fix
Versioning
AUTO-597 Shortcode Embed Proof of Concept
Merge branch 'integration' into shortcodepoc
fix merge regression
WIP Shortcode
AUTO-597 Shortcode Embed Proof of Concept
wip
fix merge regression
AUTO-534
AUTO-621 When a feed is created, set the submission_template_id value to the submission_template with the name of ShortCode Template
Merge pull request #185 from GrabNetworks/auto534

AUTO-534
Merge pull request #186 from GrabNetworks/shortcodepoc

Shortcodepoc 621
fixed a bad reference to a funtion