cleanned up for pull request

Conflicts:
	BGE/BGE.vcxproj
	BGE/BGE.vcxproj.filters
	BGE/CapsuleGame.cpp
	BGE/GLDebugDrawer.cpp
	BGE/GLDebugDrawer.h
	BGE/PhysicsFactory.cpp
	BGE/PhysicsGame1.cpp
merged assignment/upstream
started pegboard