Merge branch 'app_vmap' into 'master'

client/css/icons/fonts/veremes.eot

client/css/icons/fonts/veremes.svg

client/css/icons/fonts/veremes.ttf

client/css/icons/fonts/veremes.woff

client/css/icons/selection.json

client/css/icons/style.css

client/javascript/app/controllers/initCtrl.js

client/javascript/app/script_client.js

client/javascript/externs/formReader/formReader.html

...nt/javascript/externs/studio/javascript/app/JsonLoader.js

client/javascript/externs/studio/lang/lang-en.json

client/javascript/externs/studio/lang/lang-fr.json

client/javascript/externs/studio/less/studio.less

client/javascript/externs/studio/templates/JsonLoader.html

client/less/main.less

client/templates/mainTpl.html

vas/rest/conf/selected_properties.inc

vas/rest/ws/vitis/Properties.class.inc

vas/sql/sqlQueries.xml