Various content updates for English side.
Merge pull request #132 from mattrebor/dan2

Various content updates for English side.
Merge branch 'master' of https://github.com/mattrebor/emsiweb.git into
chui

Conflicts:
	src/main/resources/emsi-church-content2.sql