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

Conflicts:
	nav/src/nav.cpp

trying to commit