working datamodel
Merge branch 'master' of github.com:wucherpfennig/farmer.exe

# By tnhuber
# Via tnhuber
* 'master' of github.com:wucherpfennig/farmer.exe:
  Layout changes & translation