Couple of fixes in scanning code.
Merge branch 'refs/heads/gltestbranch'
Merge branch 'master' of https://github.com/DanielJBlank/3D-Scanner-

Conflicts:
	mainwindow.h
	mainwindow.ui
HFS prefix removed