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.

Put libraries into one libs directory under qgroundcontrol. Changed the neccessary files with references to those libraries.