Git settings on one page with effective view - WIP.
Fixes
Move encodings to ConfigFileSettings
Remove null values
FormResolveConflicts show submodule hashes for merge conflicts
Issues fixed with conflicts in submodules

PatchProccessor support combined diff's
Support highlighting submodule hashes when use solving this submodule conflicts
Submodule conflict message changed to display current submodule hash
Merge remote-tracking branch 'gitextensions/master' into BuildServerIntegration
.gitattributes : diff as csharp for better diffs (get method name)
Add a file to set space settings of VisualStudio (or other supported editor) automatically

Using the EditorConfig Extension http://visualstudiogallery.msdn.microsoft.com/c8bccfe2-650c-4b42-bc5c-845e21f96328 ,
VisualStudio could open the GitEwtensions solution with the good space configuration. Easier for new contributions! ;)

See http://editorconfig.org for more details
FormGoToCommit: fix "combobox drop down disappears right when loading is complete" by loading data at dialog startup
FormGoToCommit: hit Enter on autocomplete list triggers Go event
FormGoToCommit: fix "jumps always to tag if tag and branch name are the same"
FormGoToCommit: prefill commit expression textbox from clipboard if contains valid data
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 icons