se agrega spring security para login
Merge branch 'master' of git@github.com:bic-java/DIF.git

Conflicts:
	dif/web/src/main/webapp/header.jsp