Antes de hacer merge.
Merge branch 'master' of
https://github.com/leynercastillo/transporte.git

Conflicts:
	transporte/build/.gitignore
	transporte/build/classes/.gitignore
	transporte/build/classes/applicationContext.xml
	transporte/build/classes/general/ValidateZK$2.class
	transporte/build/classes/general/ValidateZK$3.class
	transporte/build/classes/general/ValidateZK$4.class
	transporte/build/classes/general/ValidateZK$5.class
	transporte/build/classes/general/ValidateZK.class
	transporte/build/classes/hibernate.cfg.xml