photo

test med camera snap
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/classes.dex
	bin/dexedLibs/opencv library -
2.4.9-20fb805e1d2d3b51580f2b9a7ce00c17.jar
	bin/resources.ap_