Merge pull request #86 from mattrebor/dan2

Dan2
#72 - Added EBI in Europe & General Information page content
Merge branch 'master' of https://github.com/mattrebor/emsiweb.git into rob
Merge pull request #87 from mattrebor/rob

Added EBI in Europe & General Information page content
Merge pull request #88 from mattrebor/dan2

adding the data from the actual catalog.  still in progress...
#80 - Made minor content changes
Merge pull request #89 from mattrebor/rob

#80 - Made minor content changes
#31 - changed order of events
Merge pull request #90 from mattrebor/dan2

more development on the order form
modified last sentence
Merge pull request #91 from mattrebor/chui

modified last sentence
Updated links on home page and life publishing house with new bookstore
URL
#80 - Added Ev. YongSheng Zhang to the Chinatown church intro page

Added CKEditor 4.2

#13 - Adding initial editing capability to the CEMI church content
Removed escapeBody method from ChurchContent
Merge pull request #92 from mattrebor/rob

Modified Chinatown content, added ckeditor 4.2 and implemented basic church editing capablities
Fixed typo in update statement
Made html-head a JSP instead of JSPX file
added missing intro texts to emsi intro page
Merge pull request #94 from mattrebor/chui

added missing intro texts to emsi intro page
Merge branch 'master' of https://github.com/mattrebor/emsiweb.git into dan2