Merge remote-tracking branch 'origin/develop' into develop

src/main/ui/static/config/bdprize/templates/bd_prize_month_report.html

@@ -110,7 +110,7 @@
             </div>
         </div>
         <div class="box box-default">
-            <div class="box-header">BD Leader Commission</div>
+            <div class="box-header">BD Manager Commission</div>
             <div class="box-body table-responsive">
                 <table class="table table-bordered table-hover table-striped">
                     <thead>
@@ -138,7 +138,7 @@
             </div>
         </div>
         <!--<div class="box box-default">-->
-            <div class="box box-warning">
+            <!--<div class="box box-warning">
                 <div class="box-header">BD Manager Commission</div>
                 <div class="box-body">
                     <div class="row">
@@ -150,7 +150,7 @@
                         </div>
                     </div>
                 </div>
-            </div>
+            </div>-->
         <div class="box box-success">
                 <div class="box-header">Director Commission</div>
                 <div class="box-body">