support for choice settings
Merge pull request #3 from autermann/feature/choice-settings

Choice settings
Merge remote-tracking branch 'carsten/feature/eReporting' into feature/eReporting

* carsten/feature/eReporting:
  support for choice settings