More global configuration.
Merge branch 'master' of https://github.com/dmoisset/blog-curso

Conflicts:
	cafeblog_com/urls.py