Weight change
Merge branch 'physX'

Conflicts:
	Zeus/PhysX.h
	Zeus/Zeus.sdf
	Zeus/Zeus.suo
	Zeus/Zeus.v11.suo
Removed some things to make it compile a lot faster