Merge pull request #1213 from silverstripe-rebelalliance/feature/shortcodes

FIX issues with new shortcode parser
FIX handleAction methods should be protected now