Added filter to format short code content. Runs do_shortcode, wpautop, remove_p on content
Merge branch 'develop'