Merge branch 'master' of https://github.com/discourse/discourse
Added emoticons and moved from : to &
Merge branch 'master' of github.com:rux-pizza/discourse