Arreglando el web.xml
Ya tenemos Login super wow!
Merge origin/master

Conflicts:
	SOLSA/web/WEB-INF/web.xml
Merge origin/master