fixed main fct & dealt with FR warning
added proxy to datacollector and merge driver to keep it local
added merge driver to keep cesium proxy local
forgotten in last commit
added merge driver to keep datacollector proxy local
added merge driver to keep cesium proxy local
fixed .gitattributes bug
fixed .gitattributes bug
Merge branch 'kleeProxy'
test commit with comment
test commit with comment 2
Merge branch 'kleeProxy'
debugged main and dealt with FR warning since merge did not work