Latest cookiecutter.
Merge branch 'master' of github.com:ssafarik/Flylab

Conflicts:
	config/cookiecutter/launch/params_calibration.launch
	config/cookiecutter/launch/params_tracking.launch