Erros casused by all of the mergedd branches are now fixed for...

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.