integrated vibration
Merge branch 'master' into add-aux-input

Conflicts:
	scripts/leap/LeapController.js