Merge branch 'master' of https://github.com/multiwii/baseflight

Conflicts:
	src/cli.c