Deleted a log
Merge branch 'master' of https://github.com/EEXCESS/privacy-proxy.git

Conflicts:
	src/main/resources/META-INF/spring/elastic.xml