Add new menu item Repo -> Maintenance -> Edit .git/config
Merge branch 'master' into topic_edit_local_git_config
FormEditor: add optional warning text
Show warning on editor when editing .git/config
FormEditor: fix layout when resizing (horizontal scrollbars were hidden)
add IconWarning
use IconWarning in FormEditor
FormDeleteBranch: make dialog sizable, use IconWarning and introduce bigger top left icon
FormCreateTag: add bigger top left icon
FormCreateBranch: use TableLayout and add bigger top left icon
FormCreateBranch: fix TableLayout not to use so much space
GotoUserManualControl: fix cutoff icon
Merge branch 'feature_diff_goto_filetree_fix' into fix_add_icon_warning_use_for_FileEditor_and_DeleteBranch_instead_of_star
Added show/hide merge commits tag
minor text change
Merge remote-tracking branch 'gitextensions/master' into fix_add_icon_warning_use_for_FileEditor_and_DeleteBranch_instead_of_star

Conflicts:
	GitUI/GitUI.csproj
	GitUI/GitUICommands.cs
	GitUI/Properties/Resources.Designer.cs
	GitUI/Properties/Resources.resx
Remove big icons.
RevisionGridMenuCommands: fix: "Show remote branch" menu item checkbox did not change checkmark when RevisionGrid is part of Choose Commit dialog
"Show revision graph" as MenuCommand
"Draw non relatives gray" as MenuCommand