Merge pull request #56 from mattrebor/rob

Merged localized domain changes
Added locale resolution to the ChurchController