Merge commit
Merge branch 'master' of github.com:MoppelDerDegu/warping

Conflicts:
	ImageWarper.cpp
	Main.cpp
	QuadSaliencyManager.cpp
	Solver.cpp
	stdafx.h
stuff
gitignore
gitignore
gitignore angepasst
Refactoring