Re-added polls
Merge branch 'profile-roles'