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

Conflicts:
	pom.xml
	src/main/webapp/WEB-INF/web.xml
Reviewed how app parameters are loaded. Now obtained from a conf file
relative to home
Merge branch 'master' of git@github.com:EEXCESS/privacy-proxy.git