Merge branch 'v2' into v2-refactor

Author: gwleuverink

composer.json

@@ -33,7 +33,6 @@
     ],
     "conflict": {
         "nativephp/mobile": "*",
-        "nativephp/laravel": "*",
         "nativephp/electron": "*"
     },
     "require": {