Merge branch 'florina' into 'master'

...s/reskins/opponents/reskins/florina_easter/bunny_ears.png

.../reskins/opponents/reskins/florina_easter/flower_pink.png

...eskins/opponents/reskins/florina_easter/flower_purple.png

...ts/reskins/opponents/reskins/florina_easter/hair_side.png

...ents/reskins/opponents/reskins/florina_easter/profile.png

...ts/reskins/opponents/reskins/florina_easter/sash_back.png

...s/reskins/opponents/reskins/florina_easter/sash_front.png

...ts/reskins/opponents/reskins/florina_easter/shoe_back.png

...s/reskins/opponents/reskins/florina_easter/shoe_front.png

...eskins/opponents/reskins/florina_easter/tailcoat_back.png

...skins/opponents/reskins/florina_easter/tailcoat_front.png

opponents/florina/behaviour.xml

opponents/florina/editor.xml

opponents/florina/markers.xml

opponents/florina/meta.xml

opponents/reskins/florina_easter/0-angry.png

opponents/reskins/florina_easter/0-awkward.png

opponents/reskins/florina_easter/0-calm.png

opponents/reskins/florina_easter/0-cover.png

opponents/reskins/florina_easter/0-embarrassed.png