Merge branch 'master' into beta

Conflicts:
	AncientReligions/common/cb_types/00_cb_types.txt
	AncientReligions/common/objectives/00_factions.txt
	AncientReligions/decisions/crown_laws.txt
	AncientReligions/decisions/realm_decisions.txt
	AncientReligions/events/brythonic_flavor_events.txt
	AncientReligions/events/gaelic_flavor_events.txt
	AncientReligions/events/hellenic_flavor_events.txt
	AncientReligions/events/job_lord_spiritual.txt
	AncientReligions/events/religious_events.txt
	AncientReligions/events/roman_events.txt
	AncientReligions/interface/druidic.gfx