Merged pull request of dcondrey to render shortcodes and fixed the order of wpautop and do_shortcode

git-svn-id: https://plugins.svn.wordpress.org/subcontent/trunk@940878 b8457f37-d9ea-0310-8a92-e5e31aec5664
ommit screenshot on plugin root dir.

git-svn-id: https://plugins.svn.wordpress.org/subcontent/trunk@940879 b8457f37-d9ea-0310-8a92-e5e31aec5664