updating the sidebar
Merge branch 'master' of https://github.com/mozilla/hotdish

Conflicts:
	data/sidebar/sidebar.html