Full shortcodes support
Merge branch 'master' of https://github.com/gotardo/WP-Plugin