Did some renaming and final edits on local install
Merge branch 'master' of https://github.com/paustian/zikula-docs

Conflicts:
	Users Manual/2_1_installation.rst