editing sensitivity
justin love git
multiple of the party
Merge branch 'master' of https://github.com/jeremywrnr/life-of-the-party

Conflicts:
	OpenNI-Bin-Dev-MacOSX-v1.5.7.10/Programs/burstoftheparty/Lifeoftheparty.cpp