Modificacion de configuracion en la ubicacion de la base de datos
merge de cambios
merge cambios netbook
Merge branch 'master' of https://github.com/romeroyonatan/turnos

Conflicts:
	OSPICAL/OSPICAL/__init__.pyc
	OSPICAL/OSPICAL/settings.pyc
	OSPICAL/OSPICAL/urls.pyc
	OSPICAL/OSPICAL/wsgi.pyc
Merge branch 'master' of https://github.com/romeroyonatan/turnos

Conflicts:
	OSPICAL/OSPICAL/urls.pyc
	OSPICAL/turnos/bussiness.pyc
Se armaron algunos casos de prueba para reservar turno