Merge branch 'master' of https://github.com/mpc-hc/mpc-hc

Conflicts:
	src/mpc-hc/DVBChannel.cpp
	src/mpc-hc/FGManagerBDA.cpp
Merge branch 'master' of https://github.com/xpc1000/mpc-hc