Stash fixed for checkout branch dialog
Resized left panel in FormStash
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 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)