Merge branch 'master' of github.com:sdepold/contentful_blog