Conflicts:
	src/QGCApplication.cc
	src/QGCFileDialog.cc
	src/QGCFileDialog.h
	src/ui/MainWindow.cc
	src/ui/QGCBaseParamWidget.cc
	src/ui/WaypointList.cc
	src/ui/designer/QGCToolWidget.cc
	src/ui/linechart/LinechartWidget.cc

Merging master
Applied changes to file open/save dialogs.

Removing unused selectedFilter argument from QGXFileDialog methods.

Remove erroneous use of QFileDialog::selectNameFilter()

Sync work branch.

Fix crash when no UAS

Fixes Issue #1162

Changing the order of the QGCFileDialog::getSaveFileName() function. The idea was to expand the existing QFileDialog version but as we removed the selectedFilter, we might as well make this more intuitive. The options argument is the one trully optional and should be last.
Adding an example to the documentation on how to go about figuring out what file type was returned by these functions.

Removed the “selectedFilter” argument from the QGCFileDialog functions along with references to it in unit tests.
Fixed function declarations and prototypes formatting while at it.
Changed the caption of a few file save dialogs with a more descriptive text (explicitly telling what is being saved).

Added a dialog asking the user about overwritting an existing file.

Fixing bogus push of SettingsDialog.ui for merge hell

Remove erroneous use of QFileDialog::selectNameFilter(). No filters are to be selected. The argument selectedFilter is a pointer to a String to receive the filter selected/used by the user.

Main window central view and dock widget re-architecture

Will fix in next pull

- Central widget no longer stacked. Views are added/removed to layout
to switch view
- Dock Widgets are globals with single instance of each type
- Both central views and dock widgets are just-in-time created saving
lots of memory

UAS may be around at constructor time

No need to force them to show

This way the dock doesn’t end up too wide

Made Q3D emit updateWidget so that local view updates correctly.

Tweaking the documentation for QFileDialog and replacing the doxygen "@" escape to be consistent with the rest of the code.

QGCApplication::saveTempFlightDataLogOnMainThread()
MainWindow::startVideoCapture()
QGCBaseParamWidget::saveParametersToFile()
QGCDataPlot2D::savePlot()
QGCDataPlot2D::saveCsvLog()
WaypointList::saveWaypoints()
QGCToolWidget::exportWidget()
LinechartWidget::startLogging()

Making sure defaultSuffix doesn’t start with a dot (i.e. “.bar”)

QGCFileDialog::getSaveFileName()

Assert if defaultSuffix contains a dot (i.e. “.bar”)

UnitTest::_getSaveFileName()