Added 'Shortcode' Class
Refactored 'Shortcode' Class
Additional 'Shortcode' Class Refactor
Merge branch 'dev'