Merge branch 'master' into pre-2018.04.00

ea3c320f · Armand Bahi · da49b1ac · 01783af0 · ea3c320f · ea3c320f
Commit ea3c320f 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