Fixing indentation and refactoring code style of shapedetector
Conflicts merged
More cleanup and refactoring
Removed printf:s and changed so we know if we found courners or just canceled the shape detector