new project with web.xml
Merge branch 'master' of https://github.com/Axel29/eTargeting

Conflicts:
	WebContent/WEB-INF/web.xml
	src/Login.java