CRA-510, CRA-511: Added more consistency checks, removed warnings.
Merge branch 'CRA-505' of https://github.com/hgolsen/crava into CRA-505

Conflicts:
	src/xmlmodelfile.cpp