Merge branch 'master' into next_version

b443f83d · Armand Bahi · c34ae8c2 · 01783af0 · b443f83d · b443f83d
Commit b443f83d authored 6 years ago by Armand Bahi
--- a/.gitignore
+++ b/.gitignore
 vas/
 client/
-conf/closure
 conf/node_modules/
 conf/properties.json
 src/closure/
--- a/conf/closure
+++ b/conf/closure
+../src/closure/conf
\ No newline at end of file