Minor modifications
Merge branch 'master' of git@github.com:EEXCESS/privacy-proxy.git

Conflicts:
	src/main/java/eu/eexcess/insa/recommend/ProxyRecommendRoutes.java