German translation for Sprint 36
Minor typo
Minor changes
Resolve merge conflict
Merge pull request #113 from SAPlayer/german-translation

German translation for Sprint 36