prueba de push
aaa
BDs configurada correctamente
cambio de verificaion
Merge branch 'master' of git://github.com/DeEvo/deevo

Conflicts:
	.classpath
	src/META-INF/jdoconfig.xml
	war/WEB-INF/appengine-web.xml