Shortcode update for RTMFC blog boiler plate
Merge branch 'rtmfc'

Conflicts:
	includes/shortcodes.php