Emoji class: added functionality to enable merging of original emoji with custom set, which can be provided through plugins.
Fixed the icon alignment in the vanillicon font.
Merge branch 'stage' of github.com:vanillaforums/Garden into stage
Added a more casual :smile: emoji. Changed :satisfied: to :lol:.
Merge branch 'stage' into feature/tagging-enhancements