Merge branch 'master' into dev

Conflicts:
	composer.json
	composer.lock

composer.json

@@ -18,6 +18,7 @@
 			"Magdev\\DossierTests\\" : "tests"
 		}
 	},
+	"minimum-stability" : "stable",
 	"require" : {
 		"php" : "~7.2",
 		"ext-phar" : "*",
@@ -39,14 +40,15 @@
 		"erusev/parsedown-extra" : "^0.7.1",
 		"leafo/scssphp" : "^0.7.6",
 		"adbario/php-dot-notation" : "^2.0",
-		"magdev/console-form" : "^0.0.7@dev",
+		"magdev/console-form" : "dev-master",
 		"monolog/monolog" : "^1.23",
 		"pdfshift/pdfshift-php" : "~1.0.2",
 		"raivisdejus/html-minifier" : "~0.5"
 	},
 	"require-dev" : {
 		"wapmorgan/php-code-analyzer" : "^1.0",
-		"phpunit/phpunit" : "~8.1"
+		"phpunit/phpunit" : "~8.1",
+		"phing/phing" : "~2.16"
 	},
 	"config" : {
 		"bin-dir" : "bin"
@@ -67,6 +69,7 @@
 				]
 			}
 		}
+<<<<<<< HEAD
 	},
 	"repositories" : [{
 			"type" : "git",
@@ -75,4 +78,7 @@
 		}
 	],
 	"minimum-stability" : "stable"
+=======
+	}
+>>>>>>> refs/heads/master
 }