ShowSuperprojectTags/Branches/RemoteBranches and Conflict_Base/Remote/Local
FormMergeSubmodule
Change Submodule change icons, making FastForward != NewerTime and Rewind != OlderTime
AddedCommits and RemovedCommits in GitSubmoduleStatus
Allow Create branch on Module.IsDetachedHead
Show commit changes (i.e: -1+5) on CheckoutBranch, CheckoutRevision, CreateBranch and CreateTag
fix running buttons RevisionGrid
Merge branch 'master' into SubmoduleImprovements

Conflicts:
	GitCommands/Git/GitModule.cs
	GitUI/CommandsDialogs/FormBrowse.cs
	GitUI/CommandsDialogs/FormCheckoutRevision.Designer.cs
	GitUI/CommandsDialogs/FormCreateBranch.Designer.cs
	GitUI/UserControls/RevisionGrid.cs
	GitUI/UserControls/RevisionGridClasses/RevisionGridMenuCommands.cs
fix compilation errors and review changes
Fix formatting after merge
Merge branch 'master' into SubmoduleImprovements
btOpenSubmodule as default
add ShowRemoteBranches and ShowSuperproject[Tags/Branches/RemoteBranches] to AppSettings
fix showSuperprojectTags -> showRemoteBranches
Fixed commit links after commit info has been cached
use --heads and --tags when ShowSuperprojectRemoteBranches is false
consider the case of !ShowSuperprojectBranches && !ShowSuperprojectTags && !ShowSuperprojectRemoteBranches
Merge branch 'pr/n2172_olmobrutall'
Added support for remote branches to the DeleteUnusedBranches plugin
Added support for unmerged branches to the DeleteUnusedBranches plugin