Merge pull request #81 from Firesphere/master

Wrong commit, should've commited to Development.
Move shortcode-parsers to it's own class.
Merge branch 'release/1.4.3.3'