Merge branch 'develop' of

https://gitlab.bsc.es/inb/etransafe/pretox-rest-api.git into develop

Conflicts:
	src/main/java/es/bsc/inb/ades/rest/api/controllers/DocumentController.java
	src/main/resources/application.properties
1 job for develop in 3 seconds (queued for 1 minute and 19 seconds)