Adding polls
Merge branch 'develop'