Merge branch 'next_version' into 'pre-2018.04.00'

...uration/configuration_vitis_configuration_vmapConfig.json

src/module_vmap/module/javascript/vitis/script_module.js

src/module_vmap/module/lang/lang-en.json

src/module_vmap/module/lang/lang-fr.json

src/module_vmap/module/template/tools/basicselect.html

src/module_vmap/module/template/tools/basictools.html

src/module_vmap/module/template/tools/location.html

src/module_vmap/module/template/tools/select.html

src/module_vmap/module/template/vmap.html

src/module_vmap/web_service/conf/properties.inc

src/vitis/client/templates/mainTpl.html

src/vitis/vas/rest/conf/selected_properties.inc

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