Add buttons to bottom of data activity.
Merge branch 'master' of ssh://github.com/jkloosterman/qr_nutrition

Conflicts:
	bin/QRNutrition.apk
	bin/classes.dex
	bin/classes/edu/umich/qrnutrition/DataActivity.class
	bin/classes/edu/umich/qrnutrition/R$id.class
	bin/classes/edu/umich/qrnutrition/R$string.class
	bin/classes/edu/umich/qrnutrition/R$style.class
	bin/resources.ap_
	src/edu/umich/qrnutrition/DataActivity.java