Merge branch 'develop'

Conflicts:
	module/Core/public/less/yawik.less

.gitignore

@@ -1,7 +1,7 @@
 /.env
 /behat.yml
 /.env.test
-/composer.lock
+/package-lock.json
 
 #
 # General text editors backup files

composer.json

@@ -23,13 +23,17 @@
     "support": {
         "email": "contact@yawik.org",
         "docs": "http://yawik.readthedocs.org/en/latest/",
-	    "forum": "https://groups.google.com/forum/#!forum/yawik",
-	    "issues": "https://github.com/cross-solution/YAWIK/issues"
+        "forum": "https://groups.google.com/forum/#!forum/yawik",
+        "issues": "https://github.com/cross-solution/YAWIK/issues"
     },
     "license": "MIT",
     "keywords": [
-        "human resource", "human relation", "applicant", "ATS",
-        "zf2", "jobboard"
+        "human resource",
+        "human relation",
+        "applicant",
+        "ATS",
+        "zf2",
+        "jobboard"
     ],
     "homepage": "http://yawik.org/",
     "minimum-stability": "dev",
@@ -53,6 +57,7 @@
         "symfony/process": "^3.4 | ^4.1",
         "tracy/tracy": "^2.4",
         "yawik/composer-plugin": ">=0.32@dev",
+        "yawik/geo": "^0.33.9",
         "zendframework/zend-authentication": "^2.5",
         "zendframework/zend-cache": "^2.7",
         "zendframework/zend-captcha": "^2.7",
@@ -87,7 +92,7 @@
         "lakion/mink-debug-extension": "^1.2.3",
         "mikey179/vfsstream": "^1.6",
         "novaway/common-contexts": "~2.0",
-        "phpunit/phpunit": "^5.7",
+        "phpunit/phpunit": "^7.5.8 || ^8.1.2",
         "se/selenium-server-standalone": "^2.52",
         "zendframework/zend-component-installer": "^1.1 | ^2.0",
         "zendframework/zend-test": "^3.1"
@@ -154,7 +159,6 @@
         "yawik/auth": "self.version",
         "yawik/core": "self.version",
         "yawik/cv": "self.version",
-        "yawik/geo": "self.version",
         "yawik/install": "self.version",
         "yawik/jobs": "self.version",
         "yawik/organizations": "self.version",