Merge branch 'master' into dev-vj

app/Http/Controllers/HomeController.php

@@ -1397,7 +1397,8 @@ WHERE measurement.label NOT IN ('SBP', 'DBP')
         }
 
         $appointments = $appointments
-            // ->whereRaw('status NOT IN (\'CANCELLED\', \'COMPLETED\')')
+            
+	    // ->whereRaw('status NOT IN (\'CANCELLED\', \'COMPLETED\')')
             ->orderBy('start_time', 'asc')
             ->get();