new commit by @pazitos10
Merge branch 'master' of https://github.com/Pazitos10/DesarrolloSoftware2013

Conflicts:
	sources/Zenda/gestionServicios/management/commands/cargar_datos.py
	sources/Zenda/gestionServicios/models.py
	sources/Zenda/gestionServicios/views.py
	sources/Zenda/zendadb