fixing selecting emoticons
Merge remote-tracking branch 'heroku'
fixed comment picture