add reference to ContactEquation from FrictionEquation. Will later be used to rescale max friction in solver
added .shapeA and .shapeB to ContactEquation and FrictionEquation, and code that sets these in the narrowphase. Fixes #33.