lulu
Merge branch 'master' of https://github.com/niko1003/Susie

Conflicts:
	bin/Susie.apk
	bin/classes.dex
	bin/classes/detection/DetectedObject.class
	bin/classes/org/opencv/samples/tutorial1/PursuingOfficer.class
	bin/classes/org/opencv/samples/tutorial1/Tutorial1Activity.class
	bin/classes/robot/RoboControl.class
	bin/resources.ap_
	src/detection/DetectedObject.java
	src/org/opencv/samples/tutorial1/PursuingOfficer.java
	src/org/opencv/samples/tutorial1/Tutorial1Activity.java