chapters
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	public/css/MFstyle.css