Merge branch 'master' into app_vmap

module/forms/users/users_vitis_users_vmap_user.json

...ess_object/vmap_business_object_vmap_business_object.json

module/javascript/app/vmap/mapmanager/layerstree.js

module/javascript/app/vmap/mapmanager/mapmanager.js

module/javascript/app/vmap/tools/insert.js

module/javascript/app/vmap/tools/location.js

module/javascript/app/vmap/tools/measure.js

module/javascript/app/vmap/tools/print.js

module/javascript/app/vmap/tools/select/advancedselect.js

module/javascript/app/vmap/tools/select/basicselect.js

module/javascript/app/vmap/tools/select/select.js

module/javascript/app/vmap/vmap.js

module/lang/lang-en.json

module/lang/lang-fr.json

module/template/layers/layersorder.html

module/template/layers/layertree.html

module/template/layers/maplegend.html

module/template/layers/mapmodal/bingsuggestions.html

module/template/layers/mapmodal/loadgeometry.html

module/template/layers/mapmodal/maplist.html