made brief descriptor based matches using simple flann
Merge branch 'master' of github.com:carolanitz/VideoPanorama

Conflicts:
	matcher/slowmatcher.cpp
Merge branch 'master' of github.com:carolanitz/VideoPanorama