Merged changes
Updated german translation
Merge pull request #252 from rumpelsepp/master

Updated german translation