en now default, de just for german people
Merge branch 'dev'