Merge pull request #535 from jcotrel/master

bug fixes
Cafe backgrounds added

Needs scale fix
Git conflicts
++
Merge pull request #537 from mentatzoe/master

Cafe Backgrounds Added
Atlas updated (missing cutscene characters)
Merge pull request #538 from mentatzoe/master

Atlas updated (missing cutscene characters)
Reset Circle Positions on NPC's
Atlas redux

Let’s see if it’s ok now.
Merge pull request #539 from mentatzoe/master

Atlas redux
Merge https://github.com/JohnMai/WhiteSharks
--
00

00
Merge pull request #542 from Kiroshima/master

Circle Resets
updated market note