Added description fields so the displayname can be used for e.g. buttons and links.
Merge branch 'master' into data-fields

* master:
  Added description fields so the displayname can be used for e.g. buttons and links.