AutoEat module conflict fix#4786

nickcat1 wants to merge 3 commits intoMeteorDevelopment:masterMeteorDevelopment/meteor-client:masterfrom

nickcat1:masternickcat1/meteor-client:masterCopy head branch name to clipboard