solvePnP
Merge branch 'master' of https://github.com/matoilic/ardoor

Conflicts:
	Documentation/positionsbestimmung.tex