Brought in latest version to new branch

Don't ask me why, but the other branch completely failed to properly
merge. Thus, this.
Updated Changelog
Merge pull request #114 from thefinestsieve/beta

Added Lucky Rulers
Added vanilla crusades icon
Updated Changelog
Merge pull request #115 from thefinestsieve/beta

Added icon for Vanilla Crusade option
Merge branch 'beta' into no_decadence

Conflicts:
	EMF/EMF_changelog.txt