Merge remote-tracking branch 'composer/feature/senior-officer' into staging

# Conflicts:
#	resources/views/penilai/show.blade.php

app/Http/Controllers/PenilaiController.php

@@ -1698,7 +1698,7 @@ class PenilaiController extends Controller
 
         $permohonan->update([
             'status' => 'revisi-survey',
-            'keterangan' => $request->message,
+            'keterangan' => $request->keterangan,
             'submitted_at' => now()
         ]);