Plethora of CM changes
Religious muslim county conquest is holy_war
Merge branch 'cm' of github.com:zijistark/EMF into cm

Conflicts:
	EMF/EMF_changelog.txt
Misc merge error
Norse temple gfx
More councillor job compatches
tribal_build_zeal action events
Only delay prison mercy requests for AI prisoners
On_actions further compatch
Demesne law generator ported
More compatchin'
Shattered Balance fix
MTTH fix for emf_empires.0
Merged/tweaked main static_modifiers into EMF+SWMH
Military techs returned to +30% at max level
Version update
Merge pull request #135 from zijistark/cm

Charlemagne / CKII v2.2 Compatibility