fixed drupal root issue (lstillwe)
Merge branch 'development' of github.com:hydroshare/hydroshare into development