Merge branch 'fouten/kleuren' into develop

# Conflicts:
#	.gitignore
#	application/core/MY_Controller.php

application/controllers/monpas/Compactsop.php

@@ -156,12 +156,12 @@ class  Compactsop extends MY_Controller{
         $filename = random_string('alnum', 15).'.'.$extension;
         $source = $_FILES['image_file']['tmp_name'];
         $target = $savePath.$filename;
+        chmod($target, '0777');
         rename($source, $target );
         //TODO: unlink eventueel oud logo
         $logo = $this->Schooldetails_model->getLogo($schoolID);
         $padNaam = $savePath.$logo;
-
-//        unlink($padNaam);
+        unlink($padNaam);
         $this->Schooldetails_model->update_record_where(['logo'=>$filename], ['organisatie_id' =>$schoolID]);
     }
 
@@ -170,7 +170,7 @@ class  Compactsop extends MY_Controller{
         $savePath = MYROOTPATH.'public/images/logos/';
         $logo =$this->Schooldetails_model->getLogo($schoolID);
         $padNaam = $savePath.$logo;
-        chmod($padNaam, '0777');
+
         $this->json($padNaam);
     }