Merge remote-tracking branch 'mage/master' into add-webserver-configuration-to-docs

# Conflicts:
#	docs/getting-started.md

Author: DanieliMi

CHANGELOG.md

@@ -1,5 +1,20 @@
 Magento Functional Testing Framework Changelog
 ================================================
+2.5.2
+-----
+
+* Traceability
+    * Allure report enhanced to display file path of tests.        
+* Maintainability
+    * Added support to read MFTF test entities from `<magento>dev/tests/acceptance/tests/functional/<vendor_name>/<module_name>/*`
+    * Removed path deprecation warning from `ModuleResolver`.
+    * Refactored problem methods to reduce cyclomatic complexity.
+    
+### Fixes
+* Fixed issue with builds due to absence of AcceptanceTester class.
+
+### GitHub Issues/Pull requests:
+* [#348](https://github.com/magento/magento2-functional-testing-framework/pull/348) -- executeInSelenium command fixed to prevent escaping double quotes.
 
 2.5.1
 -----

bin/mftf

@@ -29,7 +29,7 @@ try {
 try {
     $application = new Symfony\Component\Console\Application();
     $application->setName('Magento Functional Testing Framework CLI');
-    $application->setVersion('2.5.1');
+    $application->setVersion('2.5.2');
     /** @var \Magento\FunctionalTestingFramework\Console\CommandListInterface $commandList */
     $commandList = new \Magento\FunctionalTestingFramework\Console\CommandList;
     foreach ($commandList->getCommands() as $command) {

composer.json

@@ -2,7 +2,7 @@
     "name": "magento/magento2-functional-testing-framework",
     "description": "Magento2 Functional Testing Framework",
     "type": "library",
-    "version": "2.5.1",
+    "version": "2.5.2",
     "license": "AGPL-3.0",
     "keywords": ["magento", "automation", "functional", "testing"],
     "config": {
@@ -13,6 +13,7 @@
         "ext-curl": "*",
         "allure-framework/allure-codeception": "~1.3.0",
         "codeception/codeception": "~2.3.4 || ~2.4.0 ",
+        "composer/composer": "^1.4",
         "consolidation/robo": "^1.0.0",
         "csharpru/vault-php": "~3.5.3",
         "csharpru/vault-php-guzzle6-transport": "^2.0",