Merge branch 'master', remote branch 'origin/master'

cbaselib/Example.cpp

@@ -13,6 +13,7 @@ Example::Example()
 	y = 0;
 	vec = NULL;
 	svec = NULL;
+  ce = NULL;
 	position = 0;
 }
 

math/mathbase/Featuretype.cpp

@@ -1,3 +1,5 @@
+#include <stdlib.h>
+#include <assert.h>
 #include "vislearning/math/mathbase/Featuretype.h"
 
 using namespace OBJREC;