Fixed schortcode display to show shortcode instead of title
Merge branches 'shortcode_display' and 'master'