Merge branch 'github_2_1' into rel_2_1

Merge branch 'github_2_1' into rel_2_1

Conflicts:
	1.6/integration/intro.xml
	admin/admin-intro.xml
	appendices/about_this_documentation.xml
	appendices/bookindex.xml
	appendices/glossary.xml
	appendices/more_info.xml
	appendices/permissions.xml
	appendices/schema.xml
	development/development_intro.xml
	intro/about_evergreen.xml
	intro/intro_intro.xml
	intro/releasenotes.xml
	media/evergreen_logo.gif
	opac/opac_intro.xml
	reports/report-intro.xml
	stafftasks/README
	stafftasks/stafftasks_intro.xml