Data update
oops
Merge remote-tracking branch 'upstream/master' into android
Updated data.py, added "multihoofdrinking"