chapter from TED
Merge remote-tracking branch 'origin/hotspot' into hotspot

Conflicts:
	public/css/MFstyle.css
	public/css/MFstyle.scss