refs #12777
Merge branch '2.0-dev' of github.com:NETivism/netiCRM into 2.0-dev
Add label field to location type
fixes upgrade to d7 error.
update drupal