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

Conflicts:
	ImageWarper.cpp
Skalierungsfaktor Anpassung