Update Jaime's email address
Merge branch 'master' into step-00-startproject
Merge branch 'step-00-startproject' into step-01-views
Merge branch 'step-01-views' into step-02-templates
Merge branch 'step-02-templates' into step-03-tags
Merge branch 'step-03-tags' into step-04-filters
Merge branch 'step-04-filters' into step-05-inheritance
Merge branch 'step-05-inheritance' into step-06-models