Merge branch 'next_version' into 'pre-2018.04.00'

...uration/configuration_vitis_configuration_vmapConfig.json

module/javascript/vitis/script_module.js

module/lang/lang-en.json

module/lang/lang-fr.json

module/template/tools/basicselect.html

module/template/tools/basictools.html

module/template/tools/location.html

module/template/tools/select.html

module/template/vmap.html

web_service/conf/properties.inc