Merge branch 'edge_features' of https://github.com/izewiske/3Hat into edge_features

Conflicts:
	OpenSURF/src/surf.cpp
merging with edge_features
Merge branch 'edge_features' of https://github.com/izewiske/3Hat into edge_features