Merge branch 'master' of https://github.com/erudnick-cohen/tortuga

Conflicts:
	packages/control/src/CombineController.cpp
Merge branch 'master' of https://github.com/katzchen/tortuga

Conflicts:
	data/config/vision/test.yml
Merge branch 'master' of https://github.com/schristian/tortuga
Merge branch 'master' of https://github.com/schristian/tortuga

Conflicts:
	data/config/vision/test.yml
Merge branch 'master' of https://github.com/erudnick-cohen/tortuga
Merge branch 'master' of https://github.com/katzchen/tortuga
Merge branch 'master' of https://github.com/katzchen/tortuga

Conflicts:
	data/config/vision/test.yml
Merge branch 'master' of https://github.com/tortugaRAM/tortuga

Conflicts:
	data/config/vision/test.yml