cambio en las urls
Merge branch 'master' of github.com:sergiomonge10/soporte

Conflicts:
	soporte/settings.py