Tess4j example
Merge branch 'master' of https://github.com/mikehoogesteger/Google-glass

Conflicts:
	Scanner/bin/classes/com/infosupport/OCRActivity$5.class
	Scanner/bin/classes/com/infosupport/OCRActivity.class