Added some features that should be orientation independent
learn mode to display original + contour image and features extracted
David's merge