Merge branch 'master' of bwpgit:BWPB3/B3ButcherManageClient # Conflicts: # B3ButcherManageClient.sln # BO/BO.csproj # BO/Utils/AfterLoginUtil.cs # QualityAndOrder/QualityOrderForm.Designer.cs # QualityAndOrder/QualityOrderForm.resx # WeighAndGrading/GradeFrom.Designer.cs