TRAINING-36: Code for finished_version branch
Merge branch 'master' of github.com:AmazeeLabs/drupal8-training