local commit
Merge branch 'master' of https://github.com/adamvail/drupal_modules
registration role and affilitation functionality
Merge branch 'master' of https://github.com/adamvail/drupal_modules