Update R.java after merge
fixing stuff & commenting OCR code
Comment tesseract reference; code compiles