Correction for road to maker faire challenge short code
Misc training camp, HIW, and assurance changes
Merge branch 'maker-camp'

Conflicts:
	includes/shortcodes.php