fixed compilation errors
Merge remote-tracking branch 'deegree/master' into deegreemaster