Better wording

Refomulated for better understanding
Fixed a few obvious spelling, grammar, punctuation and capitalization errors in the branching
chapter of the German translation.
Merge pull request #513 from Brackmeister/master

Some fixes to the German translation
Second version of the patch (беспорядок => путаница)
Merge pull request #504 from tendium/patch-1

Better wording
Merge branch 'progit/master' into ja