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.