Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp

 Conflicts:

	skolehjem/resources/views/admin/events/create.blade.php

skolehjem/app/Http/Controllers/GuideController.php

@@ -14,6 +14,7 @@ class GuideController extends Controller
     public function __construct()
     {
         $this->middleware([ "auth" ]);
+        $this->middleware([ "lang" ]);
 
         $this->middleware([ "check.auth:guides.list" ])->only("index");
         $this->middleware([ "check.auth:guides.show" ])->only("show");
@@ -144,13 +145,14 @@ class GuideController extends Controller
     /**
      * Remove the specified resource from storage.
      *
-     * @param  \App\Guide  $guide
+     * @param  Guide  $guide
      * @return \Illuminate\Http\Response
      */
-    public function destroy(Guide $guide)
+    public function destroy($guide)
     {
-        $guide = MenuPlan::find($guide);
+        $guide = Guide::find($guide);
         $guide->delete();
+
         return redirect()->route("guides.index");
     }
 }