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