resolved broken code (damn)
merge conflict resolved
cleaned
added functionality to OCREngine

Can now be used without filters (serious commit for a change)
merge shit
merging conflicts resolved