Merge branch 'feature/feature_refactor' of git.drupal.org:project/healthlink into feature/feature_refactor