configuracion
Merge branch 'master' of https://github.com/darkspiriton/FutbolFive

Conflicts:
	build/web/WEB-INF/classes/futbol/five/com/servlet/ListarCanchas.class
	build/web/WEB-INF/classes/futbol/five/com/servlet/RegistroPartido.class
	nbproject/private/private.xml
prueba