Fixed merge issue with csproj
Fixed merge issue with csproj

wtilton/Nancy,JoeStead/Nancy,AcklenAvenue/Nancy,damianh/Nancy,wtilton/Nancy,jongleur1983/Nancy,danbarua/Nancy,charleypeng/Nancy,asbjornu/Nancy,SaveTrees/Nancy,AIexandr/Nancy,murador/Nancy,grumpydev/Nancy,NancyFx/Nancy,Crisfole/Nancy,anton-gogolev/Nancy,thecodejunkie/Nancy,AlexPuiu/Nancy,malikdiarra/Nancy,jchannon/Nancy,jmptrader/Nancy,AcklenAvenue/Nancy,jongleur1983/Nancy,joebuschmann/Nancy,vladlopes/Nancy,horsdal/Nancy,adamhathcock/Nancy,damianh/Nancy,EIrwin/Nancy,sadiqhirani/Nancy,duszekmestre/Nancy,guodf/Nancy,guodf/Nancy,lijunle/Nancy,danbarua/Nancy,thecodejunkie/Nancy,vladlopes/Nancy,albertjan/Nancy,Worthaboutapig/Nancy,xt0rted/Nancy,dbabox/Nancy,khellang/Nancy,dbabox/Nancy,blairconrad/Nancy,duszekmestre/Nancy,Worthaboutapig/Nancy,EIrwin/Nancy,AIexandr/Nancy,fly19890211/Nancy,sroylance/Nancy,guodf/Nancy,jeff-pang/Nancy,rudygt/Nancy,horsdal/Nancy,khellang/Nancy,davidallyoung/Nancy,anton-gogolev/Nancy,xt0rted/Nancy,ccellar/Nancy,cgourlay/Nancy,blairconrad/Nancy,albertjan/Nancy,charleypeng/Nancy,grumpydev/Nancy,daniellor/Nancy,fly19890211/Nancy,EIrwin/Nancy,ayoung/Nancy,JoeStead/Nancy,hitesh97/Nancy,cgourlay/Nancy,nicklv/Nancy,sadiqhirani/Nancy,AlexPuiu/Nancy,grumpydev/Nancy,tparnell8/Nancy,jchannon/Nancy,sloncho/Nancy,Novakov/Nancy,ayoung/Nancy,anton-gogolev/Nancy,jmptrader/Nancy,adamhathcock/Nancy,fly19890211/Nancy,AIexandr/Nancy,jeff-pang/Nancy,phillip-haydon/Nancy,ccellar/Nancy,asbjornu/Nancy,jonathanfoster/Nancy,davidallyoung/Nancy,VQComms/Nancy,SaveTrees/Nancy,JoeStead/Nancy,tareq-s/Nancy,ccellar/Nancy,tparnell8/Nancy,thecodejunkie/Nancy,VQComms/Nancy,dbolkensteyn/Nancy,tparnell8/Nancy,davidallyoung/Nancy,sadiqhirani/Nancy,felipeleusin/Nancy,damianh/Nancy,sloncho/Nancy,dbolkensteyn/Nancy,adamhathcock/Nancy,charleypeng/Nancy,jeff-pang/Nancy,cgourlay/Nancy,dbolkensteyn/Nancy,nicklv/Nancy,ayoung/Nancy,asbjornu/Nancy,jmptrader/Nancy,jeff-pang/Nancy,AIexandr/Nancy,lijunle/Nancy,NancyFx/Nancy,malikdiarra/Nancy,ccellar/Nancy,Novakov/Nancy,Crisfole/Nancy,phillip-haydon/Nancy,joebuschmann/Nancy,hitesh97/Nancy,duszekmestre/Nancy,jonathanfoster/Nancy,jongleur1983/Nancy,felipeleusin/Nancy,malikdiarra/Nancy,EliotJones/NancyTest,rudygt/Nancy,jchannon/Nancy,kekekeks/Nancy,felipeleusin/Nancy,asbjornu/Nancy,tsdl2013/Nancy,danbarua/Nancy,horsdal/Nancy,tareq-s/Nancy,asbjornu/Nancy,dbabox/Nancy,EliotJones/NancyTest,MetSystem/Nancy,dbabox/Nancy,xt0rted/Nancy,tparnell8/Nancy,jonathanfoster/Nancy,kekekeks/Nancy,tareq-s/Nancy,duszekmestre/Nancy,jmptrader/Nancy,sroylance/Nancy,adamhathcock/Nancy,VQComms/Nancy,kekekeks/Nancy,daniellor/Nancy,NancyFx/Nancy,murador/Nancy,tsdl2013/Nancy,phillip-haydon/Nancy,fly19890211/Nancy,EliotJones/NancyTest,grumpydev/Nancy,jchannon/Nancy,tsdl2013/Nancy,wtilton/Nancy,AlexPuiu/Nancy,nicklv/Nancy,davidallyoung/Nancy,rudygt/Nancy,malikdiarra/Nancy,MetSystem/Nancy,nicklv/Nancy,EIrwin/Nancy,anton-gogolev/Nancy,tareq-s/Nancy,AlexPuiu/Nancy,phillip-haydon/Nancy,cgourlay/Nancy,Crisfole/Nancy,murador/Nancy,lijunle/Nancy,hitesh97/Nancy,blairconrad/Nancy,khellang/Nancy,dbolkensteyn/Nancy,danbarua/Nancy,EliotJones/NancyTest,SaveTrees/Nancy,wtilton/Nancy,albertjan/Nancy,xt0rted/Nancy,jchannon/Nancy,khellang/Nancy,AcklenAvenue/Nancy,JoeStead/Nancy,daniellor/Nancy,jonathanfoster/Nancy,vladlopes/Nancy,Novakov/Nancy,charleypeng/Nancy,SaveTrees/Nancy,albertjan/Nancy,felipeleusin/Nancy,daniellor/Nancy,MetSystem/Nancy,AcklenAvenue/Nancy,vladlopes/Nancy,VQComms/Nancy,charleypeng/Nancy,sroylance/Nancy,ayoung/Nancy,horsdal/Nancy,blairconrad/Nancy,lijunle/Nancy,Novakov/Nancy,guodf/Nancy,sroylance/Nancy,murador/Nancy,thecodejunkie/Nancy,sadiqhirani/Nancy,MetSystem/Nancy,joebuschmann/Nancy,Worthaboutapig/Nancy,joebuschmann/Nancy,jongleur1983/Nancy,AIexandr/Nancy,sloncho/Nancy,rudygt/Nancy,sloncho/Nancy,NancyFx/Nancy,davidallyoung/Nancy,Worthaboutapig/Nancy,hitesh97/Nancy,VQComms/Nancy,tsdl2013/Nancy