new scroll wheel selector instead of swipe
Merge branch 'master' of github.com:zl87/nutri-app

Conflicts:
	android/bin/R.txt
	android/bin/classes.dex
	android/bin/classes/edu/sfsu/cs/orange/ocr/R$id.class
	android/bin/classes/edu/sfsu/cs/orange/ocr/R$layout.class
	android/bin/classes/edu/sfsu/cs/orange/ocr/R$menu.class
	android/bin/classes/edu/sfsu/cs/orange/ocr/R$raw.class
	android/bin/classes/edu/sfsu/cs/orange/ocr/R$string.class
	android/bin/classes/edu/sfsu/cs/orange/ocr/R$style.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/resources.ap_
	android/gen/edu/sfsu/cs/orange/ocr/R.java