Fixes merge issue and updates forms for days
Merge branch 'master' of github.com:MarcGarreau/grubhub_v2