data update
data update
Merge remote-tracking branch 'upstream/master' into android
Change emote hash generation

It was possible that the same hash was assigned to images in different folders. The image
file is the same, but the emote name is different and therefore a different hash must be
generated, or else the EmoteDownloader in the android app gets confused
data update
Merge remote-tracking branch 'upstream/master' into android
Merge remote-tracking branch 'trellmor-android/android'

Conflicts:
	emotescraper/bmscraper/emote_processors/android_emotes_processor.py