fixed emotions buttons
Merge branch 'master' of http://github.com/meet-projects/daf-yl1-2014