make GLUT optional in cmake
fix for btMultiBody to avoid extreme energy gain
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Demos3/SimpleOpenGL3/premake4.lua