Merge branch 'master' of https://github.com/UCSD-E4E/stingray-2-0

Conflicts:
	nav/src/nav.cpp
Merge branch 'master' of https://github.com/UCSD-E4E/stingray-2-0

Conflicts:
	nav/cfg/navParams.cfg
	nav/src/nav.cpp
	planner/cfg/plannerParams.cfgc
	sbBTA252/src/sbBTA252.cpp
stingray became hammerhead