Move aliases with name at the end of aliases list
First part of the reordering
End of reordering icons
Merge branch 'feature/reorder-default-emoticons-list' into develop
Escape the smileys when listing