Fixes #310 Smilies shouldn't have same display order value
Fixes preview (#836)
Merge pull request #1098 from JN-Jones/fix-310

Fixes #310 Smilies shouldn't have same display order value
Preparing 1.6.15
visibility > visible