Save shelf data complete

Fixed merge issues.
Completed shelf data load/save code.
Added stubs for grocery list load/save.
Removed test buttons.