Nuevas
Merge branch 'master' of
https://github.com/edalac2003/ProyectoIntegradorI_2014-2.git

Conflicts:
	ProInt2014-2/WebContent/WEB-INF/applicationContext.xml