Merge pull request #16 from uiri/staging

Fix cancel button issue
added religions to model
makes sure religions are there
added updates for religion numbers
added religion fields
fixed health formula
added religion fields
added irreligious field
added religion change
fixed percentages
Fixing shit in production, DWI