wfdkghvnsd,fhgvbfghjvbjdhfbgvcnd,fgbvdfgjvbfhvb
Merge branch 'master' of https://github.com/Nicobite/GreyWind
Temp. disabled SURF for tests + cleaned up some crap