Don't keep machines active when clicked on.
Merge branch 'current-sprint' of github.com:prisms-center/materialscommons.org into current-sprint

Conflicts:
	website/app/index/navbar.html