Merge branch 'master' of https://github.com/mattrebor/emsiweb.git into dan2
Merge pull request #97 from mattrebor/chui

Gospelbroadcasting page - replace all "CD" to "光碟
Merge branch 'master' of https://github.com/mattrebor/emsiweb.git into
dan2
Merge pull request #98 from mattrebor/chui

added email to san fransisco, corrected display order for milan contact page.
#26 - Added email functionality
Merge branch 'master' of https://github.com/mattrebor/emsiweb.git into rob
Merge pull request #99 from mattrebor/rob

#26 - Added email functionality
Merge branch 'master' of https://github.com/mattrebor/emsiweb.git into
dan2

Conflicts:
	src/main/resources/emsi-church-content2.sql
Merge branch 'master' of https://github.com/mattrebor/emsiweb.git into dan2
sync with master
Merge pull request #100 from mattrebor/dan2

Dan2
Merge remote-tracking branch 'origin/master' into rob

Synch
Merge pull request #101 from mattrebor/rob

Rob
fix google map for south madrid, gent, and antwerpen