API: added Choices to the Polls
Merge remote-tracking branch 'origin/master'