Merge remote-tracking branch 'upstream/master' into dev-mode

css/spni.css

index.html

js/spniCore.js

js/spniDisplay.js

js/spniGame.js

js/spniSelect.js

opponents/aella/behaviour.xml

opponents/aella/collectibles.xml

opponents/aella/edit-dialogue.txt

opponents/aella/markers.xml

opponents/aella/meta.xml

opponents/akko/0-victory.png

opponents/akko/1-victory.png

opponents/akko/2-victory.png

opponents/akko/3-kizuna.png

opponents/akko/3-victory.png

opponents/akko/4-victory.png

opponents/akko/5-victory.png

opponents/akko/99-Sunnyclog.png

opponents/akko/99-hat.png