1109
Merge remote-tracking branch 'origin/command_wait' into command_wait

Conflicts:
	app/common.h
	app/gps.h
	app/lib/libamodem.a
	app/master.c
	app/ms.h
1109