Merge remote-tracking branch 'upstream/master'
Refactoring of GitExtensionsSettingsPage (now using table layout managers).
Merge remote-tracking branch 'upstream/master'
Merge branch 'pr/n2061_ulrichb'

Conflicts:
	GitUI/CommandsDialogs/SettingsDialog/Pages/GitExtensionsSettingsPage.Designer.cs
Changes picked from feature/left-panel that are not specific to this branch.

To lower possible amount of conflicts.
Format GitModule
Use instance private for FormSettings to check settings
Use ConfigFileSettings instead of ConfigFile
Use ConfigFileSettings instead of ConfigFile
Fixed scripts on dashboard. Closes #2070
Copy from diff including either new or old file version.
Merge branch 'master' of git://github.com/gitextensions/gitextensions
Merge branch 'master' into CommitUser

WIP fix config file issues in FormCommit