Updating Pro Form Shortcodes

- See WebSharks/Private#403
- This commit also includes a bug fix outlined in WebSharks/Private#387
Merge remote-tracking branch 'origin/000000-dev' into 000000-dev