Merge remote-tracking branch 'origin/master' into feature/stats

# Conflicts:
#	composer.lock

CHANGELOG.md

@@ -1,6 +1,22 @@
 MONARC Changelog
 ================
 
+## 2.9.15 (2020-06-02)
+
+### Fix
+
+- Impossible to export an analysis when a user has deleted a category of a measure
+  ([#282](https://github.com/monarc-project/MonarcAppFO/issues/282)).
+- Matched referentials cannot be unlinked
+  ([#289](https://github.com/monarc-project/MonarcAppFO/issues/289)).
+- Orphan categories of controls on import function
+  ([#290](https://github.com/monarc-project/MonarcAppFO/issues/290)).
+- Improvements and fixes for German translations
+  ([#293](https://github.com/monarc-project/MonarcAppFO/issues/293)).
+- Dashboard Diagrams "No Data" 2.9.14
+  ([#294](https://github.com/monarc-project/MonarcAppFO/issues/294)).
+
+
 ## 2.9.14 (2020-04-24)
 
 ### Fix

VERSION.json

@@ -1 +1 @@
-{"major":2, "minor":9, "hotfix":14}
+{"major":2, "minor":9, "hotfix":15}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "MONARC",
-  "version": "2.9.14",
+  "version": "2.9.15",
   "description": "Monarc front office application",
   "private": true,
   "repository": {