Fixing post merge bugs

core/API/Request.php

core/Controller.php

core/DataTable/Filter/AddColumnsProcessedMetricsGoal.php

core/FrontController.php

core/JqplotDataGenerator.php

core/JqplotDataGenerator/Evolution.php

core/Twig.php

core/View.php

core/View/OneClickDone.php

core/View/ReportsByDimension.php

core/View/ViewInterface.php

core/ViewDataTable.php

core/ViewDataTable/Cloud.php

core/ViewDataTable/GenerateGraphHTML.php

core/ViewDataTable/GenerateGraphHTML/ChartEvolution.php

core/ViewDataTable/GenerateGraphHTML/ChartPie.php

core/ViewDataTable/GenerateGraphHTML/ChartVerticalBar.php

core/ViewDataTable/HtmlTable.php

core/ViewDataTable/HtmlTable/AllColumns.php

core/ViewDataTable/HtmlTable/Goals.php