Save for merge fix.
Merge branch 'master' of github.com:plow-technologies/cobalt-kiosk-data-template
Add the new changes.
unSave serilization stuff.
Tests Passed