login y algun jsp
Merge branch 'login'

Conflicts:
	NewCodingtonWebPortal/WebContent/WEB-INF/web.xml
	NewCodingtonWebPortal/src/com/newcondington/web/servlets/LoginController.java
	NewCodingtonWebPortal/src/com/newcondington/web/servlets/base/FrontServlet.java
datos
Merge branch 'juanma'