Content choice type has been added.
Merge pull request #2033 from aRn0D/content/content_choice

Content choice type has been added.