Merge remote-tracking branch 'origin/master'

# Conflicts:
#	skolehjem/app/Http/Controllers/EventController.php

skolehjem/app/Http/Controllers/EventController.php

@@ -7,6 +7,7 @@ use App\User;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 
+
 class EventController extends Controller
 {
     /**
@@ -28,7 +29,7 @@ class EventController extends Controller
      */
     public function create()
     {
-        return Response::detect("events.create");
+        return Response::detect("admin.events.create");
     }
 
     /**

skolehjem/app/Http/Controllers/ExternalLinkController.php

@@ -4,6 +4,8 @@ namespace App\Http\Controllers;
 
 use App\ExternalLink;
 use Illuminate\Http\Request;
+use Illuminate\Http\Response;
+
 
 class ExternalLinkController extends Controller
 {

skolehjem/app/Http/Controllers/FeedbackController.php

@@ -3,6 +3,8 @@
 namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
+use Illuminate\Http\Response;
+
 
 class FeedbackController extends Controller
 {

skolehjem/app/Http/Controllers/PermissionController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
+use Illuminate\Http\Response;
 
 class PermissionController extends Controller
 {

skolehjem/app/Http/Controllers/ResourceCategoryController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
+use Illuminate\Http\Response;
 
 class ResourceCategoryController extends Controller
 {

skolehjem/app/Http/Controllers/ResourceController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
+use Illuminate\Http\Response;
 
 class ResourceController extends Controller
 {

skolehjem/app/Http/Controllers/ResourceExtensionController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
+use Illuminate\Http\Response;
 
 class ResourceExtensionController extends Controller
 {

skolehjem/app/Http/Controllers/WashingMachineController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
+use Illuminate\Http\Response;
 
 use App\WashingMachine;
 

skolehjem/app/Http/Controllers/WashingReservationController.php

@@ -3,6 +3,8 @@
 namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
+use Illuminate\Http\Response;
+
 use App\WashingReservation;
 
 class WashingReservationController extends Controller