Changes suggested by Roger
Capital S for Server I missed
Minor edits from Mark
Diagram -> example
Fixing up Josh's comments

Conflict fixed:
	omero/users/index.txt
Putting correct link for help site in conf.py

Conflict fixed:
	common/conf.py