We have witnessed the rebirth of the awesome-sidebar
Merge branch 'ampersand' of https://github.com/sinfo/eventdeck into ampersand
Merge branch 'ampersand' of https://github.com/sinfo/eventdeck into ampersand

Conflicts:
	client/templates/pages/companies/list.jade