Broken Commit

Reverting to working demo.
Still broken
Merge branch 'admin'
Merge branch 'db-change'

Conflicts:
	js/folding.js

This branch is the attempt of a major db model change that is better in
the long run but broken in the short term. I want the stats in the
master branch, then I will revert to the demo quality admin branch.
Merge branch 'master' of https://github.com/jjallen37/EV-Laundry