Updates from Stable
Merge branch 'new-features' of https://github.com/Thalassicus/cep-bnw into new-features

Conflicts:
	Cat/Cat/AI/CEAI_LeaderFlavors.sql
	Ceg/Ceg/AI/CEAI_LeaderFlavors.sql
Merge branch 'new-features' of https://github.com/Thalassicus/cep-bnw into new-features