Merge branch 'dev_master' into 'master'

Dev master

See merge request Development/vitis_apps/application/vmap!1

install.sh

@@ -15,11 +15,11 @@ else
     ./pull_subtrees.sh
     ./copy_hooks.sh
 
-    cd ../conf
+    cd ../client/conf
     npm install grunt --save
     npm install grunt-cli
     npm install grunt-closure-tools --save
     npm install google-closure-compiler@20160911.0.0 --save
     npm install google-closure-library@20160911.0.0 --save
-    grunt --dev
+    grunt -dev
 fi

utils/init_symlinks.sh

@@ -68,10 +68,20 @@ fi
 # Conf
 echo "---- Link conf ----"
 if ! [ -e "src/vitis/client/conf" ]; then
-	ln -rsf conf client/conf
+	# ln -rsf conf client/conf
+
+	mkdir client/conf
+	for elem in $( ls "conf"); do
+		if [[ $elem != 'properties.json' ]]; then
+			if [[ -d "conf/${elem}" || -f "conf/${elem}" ]]; then
+				echo "---- Link conf/$elem"
+				ln -rsf conf/$elem client/conf/$elem
+			fi
+		fi
+	done
 fi
 if ! [ -e "conf/closure" ]; then
-	ln -rsf src/closure/conf conf/closure
+	ln -rsf src/closure/conf client/conf/closure
 fi
 
 # Modules