new
Merge branch 'IlwisCore/master'
switched order of includes