small changes
Merge branch 'master' of https://github.com/DigitalPublishingToolkit/toolkit

Conflicts:
	docs/04_ereading_technologies.md
glossary changes
Merge branch 'master' of https://github.com/DigitalPublishingToolkit/toolkit