Merge remote-tracking branch 'upstream/master' into master_asl

Conflicts:
	src/uas/QGCMAVLinkUASFactory.cc
	src/uas/QGCMAVLinkUASFactory.h

.gitmodules

@@ -1,6 +1,3 @@
-[submodule "qupgrade"]
-	path = qupgrade
-	url = https://github.com/LorenzMeier/qupgrade.git
 [submodule "libs/mavlink/include/mavlink/v1.0"]
 	path = libs/mavlink/include/mavlink/v1.0
 	url = https://github.com/mavlink/c_library.git

README.md

@@ -87,9 +87,6 @@ Supported builds for Linux are 32 or 64-bit, built using gcc.
 ### Build on Windows
 Supported builds for Windows are 32 bit only built using Visual Studio 2013 or higher.
 
-#### Install OpenSLL prerequisite
-Install OpenSSL from here: <http://slproweb.com/products/Win32OpenSSL.html>. Make sure to install VC redistributables first, then install the 32 bit version v1.01i.
-
 #### Install Visual Studio Express 2013
 Only compilation using Visual Studio 2013 is supported. Download and install Visual Studio Express Edition (free) from here: <http://www.visualstudio.com/downloads/download-visual-studio-vs#d-express-windows-desktop>. Make sure you install the Windows Desktop version.
 

deploy/qgroundcontrol_installer.nsi

@@ -20,10 +20,8 @@ SectionEnd
 
 Section "Uninstall"
   Delete $INSTDIR\QGroundControl_uninstall.exe
-  Delete $INSTDIR\*.*
-  RMDir $INSTDIR
-  Delete "$SMPROGRAMS\QGroundControl\*.*"
-  RMDir "$SMPROGRAMS\QGroundControl\"
+  RMDir /r /REBOOTOK $INSTDIR
+  RMDir /r /REBOOTOK "$SMPROGRAMS\QGroundControl\"
 SectionEnd
 
 Section "create Start Menu Shortcuts"