Some updates
oMerge branch 'dev' of https://github.com/CTData/ctdata-drupal into dev