Update german translation
Merge pull request #255 from uwej711/update-translation

Update german translation
fix #257
Merge branch 'sonata/master'

Conflicts:
	Resources/config/form.xml