Added nonfree headers that are required for using SURF features
Merge pull request #1499 from georgebrindeiro:patch-2