Merge pull request #9 from amcgowanca/7.x-1.x

Added Advpoll patch for removing field choice index.