Resolve conflicts

...ion_depot/extraction_depot_extraction_extraction_depot.js

...dule_extraction/module/templates/depositDirectoryTpl.html

src/module_extraction/web_service/sql/sqlQueries.xml

src/module_extraction/web_service/ws/Coordsys.class.inc

src/module_extraction/web_service/ws/Coordsyss.class.inc

src/module_extraction/web_service/ws/Extraction.class.inc

...raction/web_service/ws/ExtractionExtraction.class.sql.inc

...dule_extraction/web_service/ws/Extraction_depot.class.inc

src/module_extraction/web_service/ws/Extractions.class.inc

src/module_extraction/web_service/ws/Format.class.inc

src/module_extraction/web_service/ws/Formats.class.inc

src/module_extraction/web_service/ws/Layer.class.inc

src/module_extraction/web_service/ws/Layers.class.inc