logging again
Merge branch 'master' of github.com:benadler/octocopter

Conflicts:
	koptercontrol/hokuyo.cpp
logging, again