bold
pagination fixes/update
random stuff
git-ignore
Merge branch 'master' into fixes-sam

Conflicts:
	.gitignore
	Glossary/js/foundation/min/foundation.interchange.min.js
	SettlementConference.html
	_site/SettlementConference.html
	css/main.css
	doc/extend.html
Merge branch 'fixes-sam'