Drop in the new granular synth, comment out contour stuff
Calculate average of each RGB channel and send values to the synth
Added feature detector.  Currently draws white dots.
Changed some minor drawing params with feature detection.  Using ORB.
Make sound stop on quitting, move reverb out into new patch, begin new sound for movement
Small formatting change.
manual merge for some reason idk
Merge branch 'master' into new-synth

Conflicts:
	ZenBox/src/com/zenbox/ZenBoxActivity.java
Merge branch 'master' of github.com:awdavies/ZenBox
Clean up granular synth and allow for changing files by messages
Merge branch 'new-synth'
Enable file switching (currently with two files, on touch)
Remove references to drawRGBHist and the rectangle methods
Add amen break and easier sample cycling
Add guitar sample, simplify adding samples, remove old patches and whitespace
Extend resource registration to all file types. Code format fixes
Merge branch 'master' into gui

Conflicts:
	ZenBox/res/raw/grain.pd
	ZenBox/src/com/zenbox/AudioMessenger.java
	ZenBox/src/com/zenbox/ZenBoxActivity.java