Modify symlinks strategy

.gitignore

-# client
-# vas
+vas/
+client/
 conf/closure
 conf/node_modules/
 conf/properties.json
 src/closure/conf/depswriter/
-# src/vitis/client/javascript/*.js*
-
-vas/
-client/
-
-# vas/log/
-# vas/public/
-# vas/server/
-# vas/ws_data/
-# vas/tmp/
-# vas/shared/
-# vas/upload/
-
-# 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

README.md

+<<<<<<< HEAD
 # vMap
 
 vMap is a powerfull webmapping application based on the newest open-source libraries (OpenLayers 3, Google-Closure, AngularJS, Bootstrap…).
@@ -22,3 +23,6 @@ To install the dev version of this project run the following steps:
 - Run install.sh and give the var/www/[app name] path when asked to build your tree structure
 - Now you have the correct versioned tree structure, rename var/www/[app name] as var/www/[app name]\_vai and var/www/[app name]\_dev as var/www/[app name]
 - Run `git pull` and `git push` to update/post the project and his dependencies
+=======
+Module ANC 2018.03.00 for Vitis
+>>>>>>> 3ce44dcc... Squashed 'src/module_anc/' changes from 4321adc4..8bb35778