Fixes #973 Smilies shouldn't have same display order value
Fixed issue where you couldn't edit a smilie due to the display order.
Fixed space
Merge remote-tracking branch 'upstream/feature' into fix-973
Removed unnecessary (int)
Merge pull request #1094 from PaulBender/fix-973

Fixes #310 Smilies shouldn't have same display order value