Add missing template events in smileyAdd.tpl
Merge branch '2.0'