FINALLY fixed local storage and JSON stuff.
Merge branch 'master' of ssh://github/Fingerpaint/project-code
Merge branch 'master' of ssh://github/Fingerpaint/project-code