Merge branch 'dev' of github.com:WellDone/MoMo-Firmware into dev

Conflicts:
	tools/momo-commander/makefile
	tools/momo-commander/src/CommanderShell.cpp
	tools/momo-commander/src/FTDIConnection.cpp
	tools/momo-commander/src/FTDIManager.h
	tools/momo-commander/src/FTDIShell.cpp
	tools/momo-commander/src/Shell.cpp
Merge branch 'dev' of github.com:timburke/MoMo-Firmware into dev