Save the user's choice value instead of user content
Merge branch 'feature/issue-128-choice-states-save-the-user-content-not-the-choice-value' into develop