Rework assimilation rates

Assimilation is now based on:
 - Religious policy
 - Citizenship policy
 - Government type
Version 1 Hotfix C
Merge branch 'HPM-upstream' into HPM