First pass on additional html elements handled within shortcode
Merge branch 'master' into ajax-upload