Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branches 'master' and 'develop' of https://github.com/franjaviersans/OCRMergedApp into develop
Flag cells almost implemented