Resolucion de problemas con la db
Merge branch 'master' of https://github.com/yutesa/lisa

Conflicts:
	lisa/settings.py
	lisa/settings.pyc
	lisa/urls.pyc
	yutesapp/admin.pyc
	yutesapp/models.pyc