AT: committing Dataportal to Branch post Merge
new test including homonymes
adapting test to latest code changes
reorganizing drupal sub repository: sparate folders per version 5.x, 6.x & 7.x