minor change
Merge branch 'master' of github.com:zl87/nutri-app

Conflicts:
	android/bin/OCRTest.apk
	android/bin/classes.dex
	android/bin/classes/edu/sfsu/cs/orange/ocr/CaptureActivity.class
	android/bin/classes/edu/sfsu/cs/orange/ocr/R$string.class
	android/bin/classes/edu/sfsu/cs/orange/ocr/R$styleable.class
	android/bin/classes/edu/sfsu/cs/orange/ocr/R$xml.class
	android/bin/classes/edu/sfsu/cs/orange/ocr/Visualization_Activity.class
	android/bin/resources.ap_
	android/project.properties