Changed smileys
Merge remote-tracking branch 'origin/dev/temp' into dev/temp