d
Merge github.com:sergiomonge10/carmela

Conflicts:
	carmela/settings.pyc
	noticias/urls.pyc
	paginas/models.pyc