Erros casused by all of the mergedd branches are now fixed for qgroundcontrol.pro. Working on fixing the errors that now appeare in qgcunittest.pro.

qgcunittest.pro now compiles and runs as long as run in terminal in projcts->Run Settings is unchecked.