change find_order to save both order_id and order_token in the session after it has found an order or created a new one
change find_order to save both order_id and order_token in the session after it has found an
order or created a new one

this addresses #444, which prevented guests from viewing empty carts
(cherry picked from commit e319d54f570c011cfea222d822fe2effc93fa7a1)

azclick/spree,beni55/spree,vcavallo/spree,bonobos/solidus,piousbox/spree,zamiang/spree,watg/spree,dafontaine/spree,Lostmyname/spree,Nevensoft/spree,hifly/spree,Senjai/solidus,raow/spree,adaddeo/spree,CiscoCloud/spree,Engeltj/spree,madetech/spree,derekluo/spree,tomash/spree,grzlus/spree,vivekamn/spree,firman/spree,yushine/spree,pulkit21/spree,athal7/solidus,Mayvenn/spree,freerunningtech/spree,athal7/solidus,dandanwei/spree,alepore/spree,jparr/spree,dotandbo/spree,lzcabrera/spree-1-3-stable,cutefrank/spree,sfcgeorge/spree,Migweld/spree,priyank-gupta/spree,Kagetsuki/spree,radarseesradar/spree,dotandbo/spree,Senjai/solidus,cutefrank/spree,watg/spree,FadliKun/spree,woboinc/spree,Kagetsuki/spree,rajeevriitm/spree,nooysters/spree,welitonfreitas/spree,Hates/spree,pervino/solidus,ckk-scratch/solidus,KMikhaylovCTG/spree,zaeznet/spree,progsri/spree,pervino/spree,TimurTarasenko/spree,Arpsara/solidus,FadliKun/spree,moneyspyder/spree,zamiang/spree,jspizziri/spree,joanblake/spree,camelmasa/spree,maybii/spree,ahmetabdi/spree,jsurdilla/solidus,grzlus/solidus,reidblomquist/spree,carlesjove/spree,Hawaiideveloper/shoppingcart,sliaquat/spree,jhawthorn/spree,JuandGirald/spree,maybii/spree,azclick/spree,yushine/spree,JDutil/spree,edgward/spree,Migweld/spree,xuewenfei/solidus,sideci-sample/sideci-sample-spree,lyzxsc/spree,Arpsara/solidus,grzlus/spree,PhoenixTeam/spree_phoenix,sunny2601/spree,HealthWave/spree,jordan-brough/spree,hoanghiep90/spree,softr8/spree,vmatekole/spree,tesserakt/clean_spree,jhnsntmthy/tgs_store,pulkit21/spree,shaywood2/spree,locomotivapro/spree,ayb/spree,trigrass2/spree,quentinuys/spree,useiichi/spree,alejandromangione/spree,josephholsten/plain-sight,ckk-scratch/solidus,mindvolt/spree,knuepwebdev/FloatTubeRodHolders,tesserakt/clean_spree,radarseesradar/spree,xuewenfei/solidus,codesavvy/sandbox,jimblesm/spree,jsurdilla/solidus,assembledbrands/spree,jhnsntmthy/tgs_store,rajeevriitm/spree,hifly/spree,APohio/spree,gautamsawhney/spree,yiqing95/spree,DynamoMTL/spree,keatonrow/spree,lzcabrera/spree-1-3-stable,reidblomquist/spree,Engeltj/spree,fahidnasir/spree,grzlus/solidus,devilcoders/solidus,reinaris/spree,piousbox/spree,net2b/spree,patdec/spree,shioyama/spree,APohio/spree,gregoryrikson/spree-sample,odk211/spree,volpejoaquin/spree,jeffboulet/spree,judaro13/spree-fork,FadliKun/spree,sanjay1185/mystore,CJMrozek/spree,dandanwei/spree,hoanghiep90/spree,forkata/solidus,vcavallo/spree,jspizziri/spree,caiqinghua/spree,Antdesk/karpal-spree,siddharth28/spree,TrialGuides/spree,Hawaiideveloper/shoppingcart,karlitxo/spree,scottcrawford03/solidus,siddharth28/spree,cutefrank/spree,keatonrow/spree,imella/spree,HealthWave/spree,njerrywerry/spree,volpejoaquin/spree,jordan-brough/spree,woboinc/spree,hifly/spree,pjmj777/spree,bonobos/solidus,biagidp/spree,welitonfreitas/spree,Engeltj/spree,nooysters/spree,ayb/spree,bricesanchez/spree,pjmj777/spree,tesserakt/clean_spree,ahmetabdi/spree,priyank-gupta/spree,agient/agientstorefront,PhoenixTeam/spree_phoenix,vcavallo/spree,Boomkat/spree,tancnle/spree,groundctrl/spree,tomash/spree,reinaris/spree,ujai/spree,pulkit21/spree,AgilTec/spree,KMikhaylovCTG/spree,jparr/spree,vulk/spree,orenf/spree,jordan-brough/solidus,kewaunited/spree,yiqing95/spree,lyzxsc/spree,imella/spree,wolfieorama/spree,joanblake/spree,moneyspyder/spree,grzlus/solidus,vinayvinsol/spree,Machpowersystems/spree_mach,firman/spree,azclick/spree,alejandromangione/spree,mleglise/spree,derekluo/spree,robodisco/spree,caiqinghua/spree,jordan-brough/solidus,berkes/spree,Arpsara/solidus,hifly/spree,pulkit21/spree,ramkumar-kr/spree,project-eutopia/spree,PhoenixTeam/spree_phoenix,urimikhli/spree,mindvolt/spree,ayb/spree,TrialGuides/spree,Mayvenn/spree,patdec/spree,vmatekole/spree,archSeer/spree,rakibulislam/spree,CiscoCloud/spree,jaspreet21anand/spree,Mayvenn/spree,sunny2601/spree,adaddeo/spree,dandanwei/spree,patdec/spree,yiqing95/spree,miyazawatomoka/spree,LBRapid/spree,RatioClothing/spree,Lostmyname/spree,builtbybuffalo/spree,urimikhli/spree,sideci-sample/sideci-sample-spree,sunny2601/spree,watg/spree,ramkumar-kr/spree,biagidp/spree,useiichi/spree,Senjai/spree,ujai/spree,CJMrozek/spree,surfdome/spree,rbngzlv/spree,CiscoCloud/spree,lzcabrera/spree-1-3-stable,APohio/spree,alvinjean/spree,DynamoMTL/spree,ahmetabdi/spree,vulk/spree,sfcgeorge/spree,AgilTec/spree,sliaquat/spree,njerrywerry/spree,keatonrow/spree,alvinjean/spree,raow/spree,sfcgeorge/spree,adaddeo/spree,trigrass2/spree,TrialGuides/spree,rakibulislam/spree,pervino/spree,rakibulislam/spree,freerunningtech/spree,gautamsawhney/spree,mleglise/spree,RatioClothing/spree,Senjai/solidus,builtbybuffalo/spree,bonobos/solidus,judaro13/spree-fork,vulk/spree,surfdome/spree,jordan-brough/spree,jeffboulet/spree,madetech/spree,degica/spree,Antdesk/karpal-spree,siddharth28/spree,abhishekjain16/spree,vinsol/spree,net2b/spree,mindvolt/spree,reidblomquist/spree,radarseesradar/spree,codesavvy/sandbox,alepore/spree,archSeer/spree,derekluo/spree,yomishra/pce,orenf/spree,miyazawatomoka/spree,softr8/spree,odk211/spree,lsirivong/spree,hoanghiep90/spree,volpejoaquin/spree,vulk/spree,xuewenfei/solidus,bjornlinder/Spree,alejandromangione/spree,jhnsntmthy/tgs_store,judaro13/spree-fork,woboinc/spree,delphsoft/spree-store-ballchair,Hates/spree,Lostmyname/spree,caiqinghua/spree,camelmasa/spree,assembledbrands/spree,nooysters/spree,net2b/spree,camelmasa/spree,jaspreet21anand/spree,devilcoders/solidus,AgilTec/spree,scottcrawford03/solidus,forkata/solidus,raow/spree,tancnle/spree,trigrass2/spree,SadTreeFriends/spree,zaeznet/spree,tailic/spree,karlitxo/spree,madetech/spree,KMikhaylovCTG/spree,pronix/kenigtorg,rbngzlv/spree,lsirivong/spree,Ropeney/spree,jspizziri/spree,forkata/solidus,alejandromangione/spree,Hawaiideveloper/shoppingcart,SadTreeFriends/spree,calvinl/spree,knuepwebdev/FloatTubeRodHolders,beni55/spree,kitwalker12/spree,fahidnasir/spree,gotoAndBliss/True-Jersey,shaywood2/spree,SadTreeFriends/spree,kewaunited/spree,Boomkat/spree,Migweld/spree,berkes/spree,Antdesk/karpal-spree,pjmj777/spree,jeffboulet/spree,urimikhli/spree,moneyspyder/spree,trigrass2/spree,codesavvy/sandbox,jparr/spree,agient/agientstorefront,radarseesradar/spree,ahmetabdi/spree,shaywood2/spree,gautamsawhney/spree,TimurTarasenko/spree,PhoenixTeam/spree_phoenix,dotandbo/spree,azranel/spree,yomishra/pce,Machpowersystems/spree_mach,nooysters/spree,gregoryrikson/spree-sample,useiichi/spree,bjornlinder/Spree,useiichi/spree,wolfieorama/spree,vinsol/spree,zaeznet/spree,bonobos/solidus,calvinl/spree,kewaunited/spree,StemboltHQ/spree,jhawthorn/spree,jparr/spree,xuewenfei/solidus,josephholsten/plain-sight,yomishra/pce,biagidp/spree,reinaris/spree,lsirivong/spree,tancnle/spree,jordan-brough/solidus,LBRapid/spree,groundctrl/spree,shioyama/spree,gregoryrikson/spree-sample,Hates/spree,reidblomquist/spree,brchristian/spree,yiqing95/spree,sfcgeorge/spree,archSeer/spree,karlitxo/spree,vcavallo/spree,ckk-scratch/solidus,Machpowersystems/spree_mach,RatioClothing/spree,jhawthorn/spree,bryanmtl/spree_clear2pay,agient/agientstorefront,delphsoft/spree-store-ballchair,ramkumar-kr/spree,HealthWave/spree,edgward/spree,vinsol/spree,rbngzlv/spree,progsri/spree,sliaquat/spree,JDutil/spree,azranel/spree,devilcoders/solidus,vmatekole/spree,athal7/solidus,abhishekjain16/spree,bricesanchez/spree,abhishekjain16/spree,zaeznet/spree,rbngzlv/spree,welitonfreitas/spree,piousbox/spree,locomotivapro/spree,zamiang/spree,rajeevriitm/spree,yushine/spree,brchristian/spree,lyzxsc/spree,odk211/spree,Ropeney/spree,thogg4/spree,mleglise/spree,quentinuys/spree,Migweld/spree,berkes/spree,dandanwei/spree,robodisco/spree,sunny2601/spree,progsri/spree,delphsoft/spree-store-ballchair,gotoAndBliss/True-Jersey,alvinjean/spree,jspizziri/spree,camelmasa/spree,kitwalker12/spree,omarsar/spree,tailic/spree,pronix/kenigtorg,firman/spree,Nevensoft/spree,omarsar/spree,sideci-sample/sideci-sample-spree,thogg4/spree,robodisco/spree,groundctrl/spree,hoanghiep90/spree,richardnuno/solidus,degica/spree,DarkoP/spree,Senjai/spree,azranel/spree,rakibulislam/spree,Ropeney/spree,TimurTarasenko/spree,surfdome/spree,priyank-gupta/spree,builtbybuffalo/spree,imella/spree,firman/spree,rajeevriitm/spree,Boomkat/spree,kewaunited/spree,Senjai/solidus,dafontaine/spree,mleglise/spree,JuandGirald/spree,quentinuys/spree,raow/spree,tancnle/spree,JuandGirald/spree,berkes/spree,miyazawatomoka/spree,StemboltHQ/spree,agient/agientstorefront,edgward/spree,dotandbo/spree,CJMrozek/spree,jsurdilla/solidus,vinayvinsol/spree,codesavvy/sandbox,omarsar/spree,dafontaine/spree,beni55/spree,DynamoMTL/spree,orenf/spree,vivekamn/spree,NerdsvilleCEO/spree,zamiang/spree,welitonfreitas/spree,pervino/solidus,njerrywerry/spree,devilcoders/solidus,Nevensoft/spree,CJMrozek/spree,bjornlinder/Spree,azranel/spree,shekibobo/spree,FadliKun/spree,pervino/solidus,vinsol/spree,vinayvinsol/spree,alepore/spree,reinaris/spree,locomotivapro/spree,jimblesm/spree,jasonfb/spree,omarsar/spree,jimblesm/spree,caiqinghua/spree,keatonrow/spree,calvinl/spree,miyazawatomoka/spree,richardnuno/solidus,fahidnasir/spree,adaddeo/spree,NerdsvilleCEO/spree,carlesjove/spree,project-eutopia/spree,Engeltj/spree,delphsoft/spree-store-ballchair,project-eutopia/spree,joanblake/spree,edgward/spree,tailic/spree,Kagetsuki/spree,gautamsawhney/spree,net2b/spree,ayb/spree,odk211/spree,degica/spree,preston-scott/spree,vmatekole/spree,madetech/spree,TrialGuides/spree,Ropeney/spree,grzlus/spree,Senjai/spree,jimblesm/spree,lsirivong/solidus,builtbybuffalo/spree,scottcrawford03/solidus,piousbox/spree,assembledbrands/spree,calvinl/spree,shaywood2/spree,KMikhaylovCTG/spree,Kagetsuki/spree,grzlus/spree,Lostmyname/spree,priyank-gupta/spree,quentinuys/spree,sliaquat/spree,volpejoaquin/spree,TimurTarasenko/spree,athal7/solidus,tomash/spree,yushine/spree,SadTreeFriends/spree,Mayvenn/spree,lsirivong/solidus,shekibobo/spree,locomotivapro/spree,archSeer/spree,JuandGirald/spree,jeffboulet/spree,thogg4/spree,alvinjean/spree,brchristian/spree,lsirivong/solidus,derekluo/spree,richardnuno/solidus,APohio/spree,wolfieorama/spree,beni55/spree,brchristian/spree,project-eutopia/spree,groundctrl/spree,jordan-brough/solidus,cutefrank/spree,jasonfb/spree,LBRapid/spree,jaspreet21anand/spree,ckk-scratch/solidus,freerunningtech/spree,maybii/spree,lyzxsc/spree,Arpsara/solidus,Hates/spree,thogg4/spree,njerrywerry/spree,DarkoP/spree,bricesanchez/spree,fahidnasir/spree,orenf/spree,wolfieorama/spree,lsirivong/spree,mindvolt/spree,lsirivong/solidus,progsri/spree,DarkoP/spree,DynamoMTL/spree,jasonfb/spree,maybii/spree,shekibobo/spree,grzlus/solidus,carlesjove/spree,moneyspyder/spree,robodisco/spree,pervino/spree,ramkumar-kr/spree,knuepwebdev/FloatTubeRodHolders,kitwalker12/spree,softr8/spree,gregoryrikson/spree-sample,Boomkat/spree,NerdsvilleCEO/spree,NerdsvilleCEO/spree,abhishekjain16/spree,preston-scott/spree,DarkoP/spree,dafontaine/spree,karlitxo/spree,jaspreet21anand/spree,jasonfb/spree,softr8/spree,Nevensoft/spree,ujai/spree,tomash/spree,CiscoCloud/spree,shekibobo/spree,AgilTec/spree,vinayvinsol/spree,azclick/spree,pervino/solidus,shioyama/spree,siddharth28/spree,scottcrawford03/solidus,surfdome/spree,forkata/solidus,StemboltHQ/spree,patdec/spree,JDutil/spree,richardnuno/solidus,jsurdilla/solidus,Hawaiideveloper/shoppingcart,pervino/spree,joanblake/spree,carlesjove/spree,JDutil/spree,tesserakt/clean_spree