added email to san fransisco,
Merge pull request #98 from mattrebor/chui

added email to san fransisco, corrected display order for milan contact page.
Merge branch 'master' of https://github.com/mattrebor/emsiweb.git into
dan2

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