Merge branch 'master' into 'master'

sp/opponents/weiss/0-angry.png

sp/opponents/weiss/0-calm.png

sp/opponents/weiss/0-embarrassed.png

sp/opponents/weiss/0-happy.png

sp/opponents/weiss/0-interested.png

sp/opponents/weiss/0-loss.png

sp/opponents/weiss/0-sad.png

sp/opponents/weiss/0-sarcastic.png

sp/opponents/weiss/0-shocked.png

sp/opponents/weiss/0-strip.png

sp/opponents/weiss/1-angry.png

sp/opponents/weiss/1-calm.png

sp/opponents/weiss/1-embarrassed.png

sp/opponents/weiss/1-happy.png

sp/opponents/weiss/1-interested.png

sp/opponents/weiss/1-loss.png

sp/opponents/weiss/1-sad.png

sp/opponents/weiss/1-sarcastic.png

sp/opponents/weiss/1-shocked.png

sp/opponents/weiss/1-strip.png