Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Renamed files and directories and corrected case in project file. Files and directories are case sensitive in Linux but not Windows.
  Remove files GithubSharp.Core.dll and Github.dll when upgrading
  Problem fixed with VS addin
Merge branch 'master' of github.com:fraga/gitextensions

* 'master' of github.com:fraga/gitextensions: (90 commits)
  Tag push fixed if tag creation failed
  FormSettings crash fixed. Closes #1043
  Merge pull request #1039 from tal952/master
  Revert "Converted GitExtensions.Mono.csproj to .net 4.0"
  Revert "Merge remote-tracking branch 'Chevex/NET40'"
  Minor FormSettings improvements
  GitCommands.Setting now can get version from assembly
  MouseWheelRedirector minor changes
  Upper case check for international characters fixed in spell checker
  Unnecessary "this." removed
  Word detection for Cyrillic characters fixed
  Spell checking for "internet" keyword fixed
  Converted GitExtensions.Mono.csproj to .net 4.0
  Dialog owner fixed for Quick Pull dialogs
  one more indentation :(
  fixed indentation (replaced tabs with spaces)
  Fetch all dropdown item
  The same behaviour for pull button from Commands menu
  NullReferenceException when searching through artificial commits
  Fixed diff when multiselect with artificial revision
  ...
Use git to choose file on choose local/remote/base file in FormResolveConflicts

 - It is important to use git to checkout files because old existing methods in GitModule.cs
   can checkout wrong file content. This is still a problem in method SaveBlobAs and
   should also be fixed.
 - Fixes part of issue #1456
Use git to save/open a file on save/open in FormResolveConflicts

 - It is important to use git to checkout files because old existing methods in GitModule.cs
   can checkout wrong file content. This is still a problem in method SaveBlobAs and
   should also be fixed.
- Now it is also shown an error if open or save file failed
- Fixes part of issue #1456
Only show save as and open with in context menu of conflicted files if files are present
Use a more git compatible way to convert lf to crlf in GitModule.SaveBlobAs

- The old version of GitModule.SaveBlobAs removes file information like BOM,
  the new version of GitModule.SaveBlobAs treats the file more like a binary file.
 - GitModule.ConvertCrLfToWorktree is a better way to do line ending conversion
   in GitExtensions. It converts line endings in the fashion of git.
- But it doesn't checkout files like git will do it. Because it doesn't parse .gitattributes
  file and has not the same lf to crlf algorithm.
- The best way to check out a file in SaveBlobAs would be to use git checkout <commit-id> <name of
   file>. But that would overwrite current file in working directory.
Merge branch 'master' of git://github.com/gitextensions/gitextensions

* 'master' of git://github.com/gitextensions/gitextensions: (687 commits)
  File History fixed if Settings.RevisionGraphShowWorkingDirChanges is on
  GetDiffFiles, GetStashDiffFiles and GetTreeFiles return IList instead of IEnumerable
  You break my heart (or code)
  see d958d61ecd071: use ToList() only when it is needed
  Two tests fixed
  "0 hours" text fixed
  Git working dir fixed for shell extension and VS addin after last commits
  Remove submodule command fixed
  Exception fixed for first revision in repository (Diff tab) after commit c982a8127d589
  FindGitWorkingDir should be called explicitly before creating GitModule
  Suggested local branch name fixed for svn remote branches
  Git SVN Clone support custom trunk, tags and branches directory
  Auto pull option behavior improved
  Bug fixed in ProcessSubmodulePatch. Reset form can delete directories
  Revert "IconDiffTool removed"
  GitEx shell extension registration in settings form fixed with UAC
  Icons for GitEx shell context menu added. Closes #710
  IconDiffTool removed
  Load heads async
  Revert "Check for null. Removed reverse - there is already ByCommitDateDescending"
  ...
Merge branch 'master' of github.com:fraga/gitextensions

* 'master' of github.com:fraga/gitextensions: (45 commits)
  Check selectedChunks for null
  Removed blinking of GitExtensions while auto pull on rejected is performed
  If there was no error, then use staged files list to determine if file should be removed from unstaged, otherwise rescan changes. Closes #1483
  Fixed running fetch all when set as default action. Closes #1488.
  Script command updated
  GitCommandsTest project fixed
  Revert "Use full .NetFramework 4 instead of .NetFramework 4 Client Profile"
  Moved submodule to gitextensions organization
  Synchronized access to FormStatus.OutputString.
  Fixed showing the Gerrit change submitted dialog.
  BrowseInitialize event handler didn't connect on change of GitUICommands.
  Added option to download the commit-msg hook required for Gerrit.
  Show a proper error message when the .gitreview configuration is invalid.
  .gitreview editor wouldn't load the file from the working dir.
  Don't use the Gerrit change number as a topic branch name.
  Force Gerrit issue number to be used instead of Change-Id.
  Introduced a new event PostRegisterPlugin on IGitUICommands.
  GitExtensionsShellEx VS2010 project updated
  InMem filtering by SHA
  Refactoring SetUpVars
  ...
Fixing FormCommit, mono was crashing
ViewPatch renamed to FormViewPatch
Translation form moved to separate application
Translation updated
Merge pull request #1550 from fraga/fix_FormCommit_mono

Fix form commit mono
Drag & drop error message fixed
Add Clean cache
fix the test CanGetRelativeDateString failing on seconds round up
Add GitExtensionsDoc submodule
Corrected source location link
Updated submoduls
Merge pull request #1553 from fraga/addCacheClean

Add Clean cache