essais/prise en main
Merge branch 'master' of https://github.com/EEXCESS/privacy-proxy.git

Conflicts:
	src/main/java/eu/eexcess/insa/proxy/APIService.java
	src/main/resources/META-INF/spring/elastic.xml