merge
Merge branch 'master' of https://github.com/theresa77/Generic_Classification_App

Conflicts:
	bin/Generic_Classification_App.apk
	bin/classes.dex
	bin/classes/activity/CameraActivity.class
	bin/classes/view/MinimumBoundingBoxView.class
	bin/resources.ap_