Merge pull request #1 from viastudio/master

Merging Dev to Master
Merge pull request #2 from viastudio/dev

Merge pull request #1 from viastudio/master
SHortcode Update
Merge pull request #4 from shawncoots/shortcodes

Shortcode Update