change reference to images directory for emoji, fixes #1935
fixes #1936. petCount was only being calculated for the current user, not for the profile being displayed. This data should probably be calculated in the model rather than in a controller
small fix for sanity
Merge remote-tracking branch 'upstream/develop' into develop