Merge branch 'next_app_vmap' into next_version

.gitignore

-web_service/conf/properties*
-web_service/conf/version.inc
+client
+vas
+conf/closure
+conf/node_modules/
+conf/properties.json
+src/closure/conf/depswriter/
+src/vitis/vas/log/
+src/vitis/vas/public/
+src/vitis/vas/server/
+src/vitis/vas/ws_data/
+src/vitis/vas/tmp/
+src/vitis/client/modules/
+! src/vitis/client/modules/vitis/
+src/vitis/vas/rest/ws/*
+! src/vitis/vas/rest/ws/vitis/
+src/vitis/vas/sql/*
+! src/vitis/vas/sql/sqlQueries.xml