Merge pull request #348 from larz0/master

Various UI tweaks.
added some merging logic
add missing event handler
rewriting the commit logic to be more git-like
whitespace cleanup
German translation
Merge pull request #351 from SAPlayer/german-translation

German translation
Merge pull request #352 from larz0/master

Better diff colors.
fix #309
next version is targeting Sprint 38
fix discardAllChanges and unstage
todo update
some fixes for sprint 38
nit
Merge pull request #353 from larz0/master

Changelog Dialog tweaks.
localization file generator
regenerated language files
fix codestyle
Fix history
Fix project change bug