adding polls back
added poll
Merge branch 'refactor-forum'