Merge pull request #141 from deedeelavinder/master

seed file
updated calendar for all lunchboxes orders
few clean ups; added help page
Merge pull request #143 from kheang/master

clean ups and help page
fixed school setter issues in menu_items/vendors tests
updated set_calendar on menu items; calendar now re-rendering
Merge pull request #144 from kheang/master

calendar updates; other misc items
Merge pull request #142 from deedeelavinder/master

added edit_user path
small fixes
removed error message
Merge pull request #145 from kheang/master

menu items / vendors
fixed code in order form to properly total for single day only
Merge branch 'master' of https://github.com/lunchpad/lunchpad.us into upstream_merge
merging
mid working on sign in page
Merge pull request #146 from nickpassarella/master

merging to deploy
small change to neville seed; css tweak on account card widths
precompile
added new seedfile
handled conflict
adding the real seedfile this time