Merge branch 'new_error_layout'

layout/Error.layout.php

@@ -21,9 +21,9 @@ class ErrorLayout extends Layout
     }
 
     /**
-     * @param GeneralException $exception
+     * @param Exception $exception
      */
-    public function setException(GeneralException $exception)
+    public function setException(Exception $exception)
     {
         $this->exception = $exception;
     }