CRA-505: Removed some compiler warnings.
Merge pull request #1 from ulvmoen/master

Test
Merge branch 'master' of https://github.com/CRAVA/crava

Conflicts:
	src/xmlmodelfile.cpp