Merge branch 'master' into jan_dev
 - Fixed bug in e21_cuba for picking up pickups under other lane items
 - Fixed bug in e07_france when dying on plank and not respawning
 - Changed scale of Swallows in e07_france
Merge branch 'master' of https://github.com/LuGusStudios/KikaAndBob
Merge branch 'master' into jan_dev
Merge branch 'jan_dev'