updates
Merge branch 'master' of https://github.com/koedwards/MPC_LeapMotion

Conflicts:
	com/lithium/LithiumGui.java