+ CMake build system fix under Windows: don't define _WINDOWS to allow Glut console demo to build properly

+ Allow user to enable useConvexConservativeDistanceUtil . Use dynamicsWorld->getDispatchInfo().m_useConvexConservativeDistanceUtil = true;
(see Demos/Benchmarks/Benchmark4 (convex objects falling down)
+ Fix for plane drawing (just wire-frame)
+ Gimpact: use collision margin of 0.07 for demo (because BULLET_TRIANGLE_COLLISION is used)
+ replace dot,cross,distance,angle,triple in btVector3 by btDot, btCross,btDistance,btAngle,btDistance to avoid naming conflicts
+ Some fixes in GJK penetration depth normal direction (broken in a previous commit)
+ fix in calculateDiffAxisAngleQuaternion to make ConvexConservativeDistanceUtil work properly
+ allow debug drawing to debug btContinuousConvexCollision
+ add comment/warning that btTriangleMesh::findOrAddVertex is an internal method, users should use addTriangle instead

Demos/HeightFieldFluidDemo/HfFluidDemo_GL_ShapeDrawer.cpp

@@ -557,8 +557,8 @@ void		HfFluidDemo_GL_ShapeDrawer::drawShadow(btScalar* m,const btVector3& extrus
 			glBegin(GL_QUADS);
 			for(int i=0;i<sc->m_edges.size();++i)
 			{			
-				const btScalar		d=dot(sc->m_edges[i].n[0],extrusion);
-				if((d*dot(sc->m_edges[i].n[1],extrusion))<0)
+				const btScalar		d=btDot(sc->m_edges[i].n[0],extrusion);
+				if((d*btDot(sc->m_edges[i].n[1],extrusion))<0)
 				{
 					const int			q=	d<0?1:0;
 					const btVector3&	a=	hull->getVertexPointer()[sc->m_edges[i].v[q]];