Update build dir
Merge branch 'master' of github.com:mavlink/qgroundcontrol
New version of submodule
Merge remote-tracking branch 'upstream/master' into archlinux_dev

Conflicts:
	libs/thirdParty/libxbee