Physics Commit Changes

Adjusted Friction and forces
Merge remote-tracking branch 'origin/master'

Conflicts:
	BoxPhysics 12-9-14/Solution.sdf
	BoxPhysics 12-9-14/Solution.v11.suo
	BoxPhysics 12-9-14/Z_DELETE/0_TestBed/Debug/0_TestBed.log
	BoxPhysics 12-9-14/Z_DELETE/0_TestBed/Debug/Application.obj
	BoxPhysics 12-9-14/Z_DELETE/0_TestBed/Debug/ApplicationClass.obj
	BoxPhysics 12-9-14/Z_DELETE/0_TestBed/Debug/ApplicationControls.obj
	BoxPhysics 12-9-14/Z_DELETE/0_TestBed/Debug/CL.read.1.tlog
	BoxPhysics 12-9-14/Z_DELETE/0_TestBed/Debug/CL.write.1.tlog
	BoxPhysics 12-9-14/Z_DELETE/0_TestBed/Debug/Main.obj
	BoxPhysics 12-9-14/Z_DELETE/0_TestBed/Debug/TargetBox.obj
	BoxPhysics 12-9-14/Z_DELETE/0_TestBed/Debug/TargetBoxManager.obj
	BoxPhysics 12-9-14/Z_DELETE/0_TestBed/Debug/vc110.idb
	BoxPhysics 12-9-14/Z_DELETE/0_TestBed/Debug/vc110.pdb
	BoxPhysics 12-9-14/Z_DELETE/0_TestBedD.exe
	BoxPhysics 12-9-14/Z_DELETE/0_TestBedD.ilk
	BoxPhysics 12-9-14/Z_DELETE/0_TestBedD.pdb
	BoxPhysics 12-9-14/_Binary/0_TestBedD.exe