Minor fixes
Merge branch 'new-features' of https://github.com/Thalassicus/cep-bnw into new-features

Conflicts:
	Cat/Cat/_Project/CAT_Start.sql