fix issues submiting an emoticon and show emoticon on feed
Merge branch 'master' of https://github.com/rhok-melbourne/startout