Completes #583 Maximum votes per user per poll
Merge remote-tracking branch 'upstream/feature' into feature-583
Fixes #902 Smilies Improvements

Minor placement issue...
Merge pull request #1079 from Polarbear541/feature-583

Feature #583 Maximum votes per user per poll
Merge remote-tracking branch 'upstream/feature' into fix-973
Removed unnecessary (int)