Merge pull request #6 from xanthipe/master

Various bug fixes, plus seed file updates, plus start of food overhaul.
Fixed merge user screens.
Fixes #127, #70, #105.
Merge remote-tracking branch 'upstream/master'