use 2nd scanner
Merge branch 'master' of https://github.com/benadler/octocopter

Conflicts:
	koptercontrol/koptercontrol.cpp
cosmetic