Removed 30 warnings from various classes, 30 remain.
rearanged stuff
conflict fix
Merge remote-tracking branch 'origin/master' into physics-cleanup