added features and contenttypes
Merge branch 'development' of github.com:hydroshare/hydroshare into development