Merge branch 'v2'

Conflicts:
	composer.json

Author: ahsankhatri

composer.json

@@ -14,7 +14,7 @@
     "require": {
         "php": "^7.1",
         "hautelook/phpass": ">=0.3",
-        "laravel/framework": ">=5.6 <5.9"
+        "laravel/framework": ">=5.6 <7"
     },
     "autoload": {
         "psr-4": {