diff --git a/.gitignore b/.gitignore
index 09427bc..22e55fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,11 +17,14 @@ vendor/
 public/css/
 public/js/
 public/img/
+public/flags/
 public/views/
 module/
+npm-debug.log
 node_modules/
 bin/
 data/DoctrineORMModule/
+data/monarc/
 data/json/
 go-pear.phar
 scripts/public/
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f8296e0..4f0b9f0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,27 @@
 MONARC Changelog
 ================
 
+## 2.3.0 (not yet released)
+
+### New
+
+- an administrator of a MONARC front office instance is now able to set custom
+  templates for deliveries per step.
+
+### Enhancement
+
+- default deliveries templates were improved;
+- the section dedicated to the management of the organization has been moved in
+  a dedicated view;
+- improved the switching between the different available languages;
+- improved the generation of the deliveries.
+
+### Fix
+
+- fixed a bug in the generation of the deliveries (#84);
+- Inconsistency of Threat and Vulnerability Tables (#82).
+
+
 ## 2.2.1 (2018-02-14)
 
 ### Enhancement
diff --git a/VERSION.json b/VERSION.json
index 9fdedf7..44a7ac6 100644
--- a/VERSION.json
+++ b/VERSION.json
@@ -1 +1 @@
-{"major":2, "minor":2, "hotfix":1}
+{"major":2, "minor":3, "hotfix":0}
diff --git a/deliveries/cases/DE/1.docx b/deliveries/cases/DE/1.docx
index 4f0e1a1..5d6b958 100644
Binary files a/deliveries/cases/DE/1.docx and b/deliveries/cases/DE/1.docx differ
diff --git a/deliveries/cases/DE/2.docx b/deliveries/cases/DE/2.docx
index 6af8d02..354b721 100644
Binary files a/deliveries/cases/DE/2.docx and b/deliveries/cases/DE/2.docx differ
diff --git a/deliveries/cases/DE/3.docx b/deliveries/cases/DE/3.docx
index 0105647..d080b63 100644
Binary files a/deliveries/cases/DE/3.docx and b/deliveries/cases/DE/3.docx differ
diff --git a/deliveries/cases/EN/1.docx b/deliveries/cases/EN/1.docx
index d3f9c55..6345527 100644
Binary files a/deliveries/cases/EN/1.docx and b/deliveries/cases/EN/1.docx differ
diff --git a/deliveries/cases/EN/2.docx b/deliveries/cases/EN/2.docx
index 5ede069..d3f23cb 100644
Binary files a/deliveries/cases/EN/2.docx and b/deliveries/cases/EN/2.docx differ
diff --git a/deliveries/cases/EN/3.docx b/deliveries/cases/EN/3.docx
index eb4ee16..7975161 100644
Binary files a/deliveries/cases/EN/3.docx and b/deliveries/cases/EN/3.docx differ
diff --git a/deliveries/cases/FR/1.docx b/deliveries/cases/FR/1.docx
index 66acb00..600b3c3 100644
Binary files a/deliveries/cases/FR/1.docx and b/deliveries/cases/FR/1.docx differ
diff --git a/deliveries/cases/FR/2.docx b/deliveries/cases/FR/2.docx
index ec15fff..fc062f1 100644
Binary files a/deliveries/cases/FR/2.docx and b/deliveries/cases/FR/2.docx differ
diff --git a/deliveries/cases/FR/3.docx b/deliveries/cases/FR/3.docx
index 64cc38b..2b30489 100755
Binary files a/deliveries/cases/FR/3.docx and b/deliveries/cases/FR/3.docx differ
diff --git a/deliveries/cases/NE/1.docx b/deliveries/cases/NE/1.docx
index d3f9c55..4eeb1cf 100644
Binary files a/deliveries/cases/NE/1.docx and b/deliveries/cases/NE/1.docx differ
diff --git a/deliveries/cases/NE/2.docx b/deliveries/cases/NE/2.docx
index 5ede069..99e1d46 100644
Binary files a/deliveries/cases/NE/2.docx and b/deliveries/cases/NE/2.docx differ
diff --git a/deliveries/cases/NE/3.docx b/deliveries/cases/NE/3.docx
index eb4ee16..7f64680 100644
Binary files a/deliveries/cases/NE/3.docx and b/deliveries/cases/NE/3.docx differ
diff --git a/deliveries/cases/NE/4.docx b/deliveries/cases/NE/4.docx
index 78dc61c..a1918de 100644
Binary files a/deliveries/cases/NE/4.docx and b/deliveries/cases/NE/4.docx differ
diff --git a/package.json b/package.json
index 66fa477..c7b3f75 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "MONARC",
-  "version": "2.2.1",
+  "version": "2.3.0",
   "description": "MONARC Frontoffice App",
   "private": true,
   "repository": {
diff --git a/scripts/link_modules_resources.sh b/scripts/link_modules_resources.sh
index 7d17683..d2aabdb 100755
--- a/scripts/link_modules_resources.sh
+++ b/scripts/link_modules_resources.sh
@@ -12,6 +12,13 @@ if [ ! -d public/css ]; then
 else
 	find -L public/css -type l -exec rm {} \;
 fi
+
+if [ ! -d public/flags ]; then
+	mkdir public/flags
+else
+	find -L public/flags -type l -exec rm {} \;
+fi
+
 if [ ! -d public/views/dialogs ]; then
 	mkdir -p public/views/dialogs
 else
@@ -38,6 +45,7 @@ if [ -d node_modules/ng_backoffice ]; then
 	cd ../../js/ && find ../../node_modules/ng_backoffice/src -maxdepth 1 -name "*" -exec ln -s {} \; 2>/dev/null
 	cd ../css/ && find ../../node_modules/ng_backoffice/css -name "*" -exec ln -s {} \; 2>/dev/null
 	cd ../img/ && find ../../node_modules/ng_backoffice/img -name "*" -exec ln -s {} \; 2>/dev/null
+    cd ../flags/ && find ../../node_modules/ng_backoffice/node_modules/ng-country-flags/dist/flags -mindepth 1 -type d -exec ln -s {} \; 2>/dev/null
 
 	if [ -d ../../node_modules/ng_anr ]; then
 		cd ../js/
@@ -69,6 +77,7 @@ if [ -d node_modules/ng_client ]; then
 	cd ../../js/ && find ../../node_modules/ng_client/src -name "*" -exec ln -s {} \; 2>/dev/null
 	cd ../css/ && find ../../node_modules/ng_client/css -name "*" -exec ln -s {} \; 2>/dev/null
 	cd ../img/ && find ../../node_modules/ng_client/img -name "*" -exec ln -s {} \; 2>/dev/null
+	cd ../flags/ && find ../../node_modules/ng_client/node_modules/ng-country-flags/dist/flags -mindepth 1 -type d -exec ln -s {} \; 2>/dev/null
 
 	if [ -d ../../node_modules/ng_anr ]; then
 		cd ../js/
@@ -93,4 +102,3 @@ if [ -d node_modules/ng_client ]; then
 	grunt concat
 	popd
 fi
-