Ant buildfile and Doxfile
merging
merging
Merge branch '7.x' of https://github.com/willtp87/islandora_ocr into 7.x
Merge conflict resolution
Build and doxyfile fixes
Merge pull request #11 from daniel-dgi/7.x

7.x