reinstating the Ocr_Server with the simplistic upload interface - this was the only thing that worked with the Android upload code
merging master back in after re-instating the original ocr_server project