update aside menu
Merge branch 'gh-pages' of https://github.com/DellGDC/sherpa into gh-pages

Conflicts:
	new_site/base-css.html
	new_site/components.html
	new_site/configuration.html
	new_site/functions.html
	new_site/how-to.html
	new_site/scaffolding.html