Merge remote-tracking branch 'origin/master'

Conflicts:
	lookin-0.0/src/LeapListener.cpp