Merge branch 'master' of https://github.com/artivisi/training-djbc-2014-01