minor
Merge branch 'master' of github.com:Hi-Media/reST-test

Conflicts:
	doc/Chap3-RESTAPIResources.rst
	doc/glossary.rst
fix