Added Ticks code and geometry to Slider

Conflicts:
	Assets/3d/KeypadScaler.cs.meta
	Assets/KeyPadTrial.cs.meta
	Assets/Slider/Scripts/SliderDragger.cs.meta
Merge branch 'master' of github.com:leapmotion/p1

Conflicts:
	Assets/3d/Scripts.meta
	Assets/3d/digits/4.blend1.meta
	Assets/3d/digits/7.blend1.meta
	Assets/Grid Framework/Debug.meta
	Assets/Materials.meta
	Assets/Slider.meta
	Assets/Slider/Scripts/SliderDragger.cs.meta.orig.meta
	Assets/testFiles.meta
	Assets/testFiles/config.meta
Removing weird meta files