Updated email from configuration and admin users
Merge branch 'master' of https://github.com/DocHeads/DocsRepository

Conflicts:
	FunctionalDocs/Notes