Settings
Merge remote-tracking branch 'origin/master'

Conflicts:
	DataExport/Forms/FormMain.Designer.cs
Merge remote-tracking branch 'origin/master'

Conflicts:
	DataExport/Forms/FormMain.Designer.cs
Merge remote-tracking branch 'origin/master'

Conflicts:
	DataExport/Forms/FormMain.Designer.cs