Merge branch 'master' into server_dev

conf/Gruntfile.js

conf/closure/depswriter/source.pyc

conf/closure/depswriter/treescan.pyc

src/module_suivi_prod_immo/web_service/ws/Ilots.class.inc

...odule_suivi_prod_immo/web_service/ws/Programmes.class.inc

...vi_prod_immo/web_service/ws/Suivi_prod_immo.class.sql.inc

src/module_vmap/web_service/ws/Querys.class.inc

src/vitis/client/css/icons/style.css

...is/client/javascript/externs/formReader/formReaderDrtv.js

...is/client/javascript/externs/formReader/formReaderSrvc.js

src/vitis/vas/doc/suivi_prod_immo/get_1_operation.php

src/vitis/vas/doc/suivi_prod_immo/get_2_type.php

src/vitis/vas/doc/suivi_prod_immo/get_3_porteur.php

src/vitis/vas/doc/suivi_prod_immo/get_4_logement.php