Merged APM config changes, reverted some really ridiculous non-programming changes

.gitignore

-*.swp
-*.nfs
-CMakeFiles
-*Makefile*
-tags
-build*/
-Info.plist
-obj
-.DS_Store
-*.log
-*~
-*~.skp
-bin/*.exe
-bin/*.txt
-bin/mac
-*pro.user*
-qrc_*.cpp
-*.Debug
-*.Release
-tmp
-debug
-release
-qgroundcontrol
-mavlinkgen-build-desktop
-qgroundcontrol.xcodeproj/**
-doc/html
-doc/doxy.log
-deploy/mac
-deploy/linux
-deploy/qgroundcontrol*
-controller_log*
-user_config.pri
-*.app
-*.ncb
-*.vcproj
-*.vcxproj*
-*.sdf
-*.ipch
-*.pdb
-*.sln
-*.sln
-*.vcproj
-*.user
-*.ncb
-*.idb
-*.project
-*.cproject
-*.sln
-*.suo
-*.uhf.txt
-*.opensdf
-
-thirdParty/qserialport-build-desktop/
-thirdParty/qserialport/bin/
-thirdParty/qserialport/lib/
+*.swp
+*.nfs
+CMakeFiles
+*Makefile*
+tags
+build*/
+Info.plist
+obj
+.DS_Store
+*.log
+*~
+*~.skp
+bin/*.exe
+bin/*.txt
+bin/mac
+*pro.user*
+qrc_*.cpp
+*.Debug
+*.Release
+tmp
+debug
+release
+qgroundcontrol
+mavlinkgen-build-desktop
+qgroundcontrol.xcodeproj/**
+doc/html
+doc/doxy.log
+deploy/mac
+deploy/linux
+deploy/qgroundcontrol*
+controller_log*
+user_config.pri
+*.app
+*.ncb
+*.vcproj
+*.vcxproj*
+*.sdf
+*.ipch
+*.pdb
+*.sln
+*.sln
+*.vcproj
+*.user
+*.ncb
+*.idb
+*.project
+*.cproject
+*.sln
+*.suo
+*.uhf.txt
+*.opensdf
+apmplanner2.xcodeproj/

libs/serialport/doc/qtserialport.qdocconf

+include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
+
+project                 = QtSerialPort
+description             = Qt Serial Port Reference Documentation
+url                     = http://qt-project.org/doc/qt-$QT_VER/qtserialport
+version                 = $QT_VERSION
+
+qhp.projects            = QtSerialPort
+
+qhp.QtSerialPort.file                = qtserialport.qhp
+qhp.QtSerialPort.namespace           = org.qt-project.qtserialport.$QT_VERSION_TAG
+qhp.QtSerialPort.virtualFolder       = qtserialport
+qhp.QtSerialPort.indexTitle          = Qt Serial Port
+qhp.QtSerialPort.indexRoot           =
+
+qhp.QtSerialPort.filterAttributes    = qtserialport $QT_VERSION qtrefdoc
+qhp.QtSerialPort.customFilters.Qt.name = QtSerialPort $QT_VERSION
+qhp.QtSerialPort.customFilters.Qt.filterAttributes = qtserialport $QT_VERSION
+
+qhp.QtSerialPort.subprojects         = classes examples
+
+qhp.QtSerialPort.subprojects.classes.title = C++ Classes
+qhp.QtSerialPort.subprojects.classes.indexTitle = Qt Serial Port C++ Classes
+qhp.QtSerialPort.subprojects.classes.selectors = class fake:headerfile
+qhp.QtSerialPort.subprojects.classes.sortPages = true
+
+qhp.QtSerialPort.subprojects.examples.title = Examples
+qhp.QtSerialPort.subprojects.examples.indexTitle = Qt Serial Port Examples
+qhp.QtSerialPort.subprojects.examples.selectors = fake:example
+qhp.QtSerialPort.subprojects.examples.sortPages = true
+
+headerdirs  += ..
+sourcedirs  += ..
+exampledirs += ../../../examples/serialport
+imagedirs   += images
+
+depends += qtcore qtdoc

libs/serialport/doc/src/index.qdoc

+/****************************************************************************
+**
+** Copyright (C) 2011 - 2012 Denis Shienkov <denis.shienkov@gmail.com>
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file.  Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: http://www.gnu.org/copyleft/fdl.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page qtserialport-index.html
+    \title Qt Serial Port
+    \brief Provides API to make the serial programming simple and portable.
+
+    Qt Serial Port provides the basic functionality, which includes
+    configuring, I/O operations, get and set control signals of the
+    RS-232 pinouts.
+
+    The following are not supported by this module:
+    \list
+    \li Terminal features such as echo, control CR/LF, and so on.
+    \li Text mode.
+    \li Configuring timeouts and delays while reading.
+    \li Tracking and notification when the state of RS-232 pinout signals change.
+    \endlist
+
+    To use these classes in your application, use the following include
+    statement:
+
+    \code
+    #include <QtSerialPort/QtSerialPort>
+    \endcode
+
+    To link against the module, add this line to your \l qmake \c
+    .pro file:
+
+    \code
+    QT += serialport
+    \endcode
+
+    \section1 Related information
+    \list
+    \li \l{Qt Serial Port C++ Classes}{C++ Classes}
+    \li \l{Qt Serial Port Examples}{Examples}
+    \endlist
+
+*/

libs/serialport/doc/src/qtserialport-module.qdoc

+/****************************************************************************
+**
+** Copyright (C) 2011 - 2012 Denis Shienkov <denis.shienkov@gmail.com>
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file.  Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: http://www.gnu.org/copyleft/fdl.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \module QtSerialPort
+    \title Qt Serial Port C++ Classes
+    \brief List of C++ classes that enable access to a serial port.
+
+    To use these classes in your application, use the following include
+    statement:
+
+    \code
+    #include <QtSerialPort/QtSerialPort>
+    \endcode
+
+    To link against the module, add this line to your \l qmake \c
+    .pro file:
+
+    \code
+    QT += serialport
+    \endcode
+*/

libs/serialport/doc/style/style.css

+a:link, a:visited {
+    color: #00732F;
+    text-decoration: none;
+    font-weight: bold;
+}
+
+body {
+    font: normal 400 14px/1.2 Arial;
+    margin-top: 85px;
+}
+
+h1 {
+    margin: 0;
+}
+
+h2 {
+    font: 500 20px/1.2 Arial;
+}
+
+h3.fn, span.fn {
+    -moz-border-radius: 7px 7px 7px 7px;
+    -webkit-border-radius: 7px 7px 7px 7px;
+    border-radius: 7px 7px 7px 7px;
+    background-color: #F6F6F6;
+    border-width: 1px;
+    border-style: solid;
+    border-color: #E6E6E6;
+    word-spacing: 3px;
+    padding: 3px 5px;
+}
+
+table, pre {
+    -moz-border-radius: 7px 7px 7px 7px;
+    -webkit-border-radius: 7px 7px 7px 7px;
+    border-radius: 7px 7px 7px 7px;
+    background-color: #F6F6F6;
+    border: 1px solid #E6E6E6;
+    border-collapse: separate;
+    font-size: 12px;
+    line-height: 1.2;
+    margin-bottom: 25px;
+    margin-left: 15px;
+}
+
+table td {
+    padding: 3px 15px 3px 20px;
+}
+
+table tr.even {
+    background-color: white;
+    color: #66666E;
+}
+
+table tr.odd {
+    background-color: #F6F6F6;
+    color: #66666E;
+}
+
+li {
+    margin-bottom: 10px;
+    padding-left: 12px;
+}
+
+.cpp {
+    display: block;
+    margin: 10;
+    overflow: hidden;
+    overflow-x: hidden;
+    overflow-y: hidden;
+    padding: 20px 0 20px 0;
+}
+
+.footer {
+    margin-top: 50px;
+}
+
+.memItemLeft {
+    padding-right: 3px;
+}
+
+.memItemRight {
+    padding: 3px 15px 3px 0;
+}
+
+.qml {
+    display: block;
+    margin: 10;
+    overflow: hidden;
+    overflow-x: hidden;
+    overflow-y: hidden;
+    padding: 20px 0 20px 0;
+}
+
+.qmldefault {
+    padding-left: 5px;
+    float: right;
+    color: red;
+}
+
+.qmlreadonly {
+    padding-left: 5px;
+    float: right;
+    color: #254117;
+}
+
+.rightAlign {
+    padding: 3px 5px 3px 10px;
+    text-align: right;
+}
+
+.title {
+    background-color: white;
+    color: #44A51C;
+    font-family: Verdana;
+    font-size: 35px;
+    font-weight: normal;
+    left: 0;
+    padding-bottom: 5px;
+    padding-left: 16px;
+    padding-top: 20px;
+    position: absolute;
+    right: 0;
+    top: 0;
+}
+
+.toc {
+    float: right;
+    -moz-border-radius: 7px 7px 7px 7px;
+    -webkit-border-radius: 7px 7px 7px 7px;
+    border-radius: 7px 7px 7px 7px;
+    background-color: #F6F6F6;
+    border: 1px solid #DDD;
+    margin: 0 20px 10px 10px;
+    padding: 20px 15px 20px 20px;
+    height: auto;
+    width: 200px;
+}