Merge branch 'fx-happiness_and_faith_average' into develop
hotfix and trying stuff.
test fix.