dddd
Merge branch 'master' of https://github.com/mattrebor/emsiweb.git into
rob

Conflicts:
	src/main/webapp/WEB-INF/views/header.jspx
Added images from old website.
Added img URL replacement logic
Merge pull request #53 from mattrebor/chui

Chui
Merge pull request #54 from mattrebor/chui

Chui
Merge pull request #55 from mattrebor/chui

Added chinese to emsi-intro page
Revamped domain model to be localized
Merge branch 'master' of https://github.com/mattrebor/emsiweb.git into rob
Merge pull request #56 from mattrebor/rob

Merged localized domain changes
Added locale resolution to the ChurchController
Merge pull request #57 from mattrebor/rob

Added locale resolution to the ChurchController
Added rest of church pages
Removed osaka from church2.sql
Merge pull request #58 from mattrebor/rob

Added initial version of the church interior pages
#45 Incorporated the new logo
#28 Added new carousel images and text
Fixed CEMI link in header
Merge pull request #59 from mattrebor/rob

Added new carousel images
Changes the CEMI page titles to h2 from h1
Commented out login link temporarily