integrated Philip's mohawk colors into my hair code and added a switch to test each version
Merge remote-tracking branch 'upstream/master'
added facing other av requirement for camera shift to 1p; improved ease-in/out for camera mode shift; did some clean up on the camera code
cleanup
fixed visual glitch where mouth penetrates head sphere
improved neck rendering
normalized body spring tightness
cleaned up some formatting and in-line functions in Avatar.cpp
fixed some things based on recent code review
added Skeleton class (to be completed soon)
Merge pull request #437 from ey6es/master

Sphere/box and capsule/box collisions for voxels; allows us to slide along and stand on voxels.  Also a couple build fixes.
Merge pull request #435 from Ventrella/master

Integrated mohawk code, and did some cleanup and improvements on avatar