GridManager.js
Merge branch 'master' of github.com:danielglennross/TrackingHack

Conflicts:
	src/tracking.js-master/examples/color_camera.html