Update Jaime's email address
Merge branch 'master' into step-00-startproject
Merge branch 'step-00-startproject' into step-01-views