pushing in place changes for the last beta
Merge branch 'development' of github.com:hydroshare/hydroshare into development
added icons and some feedback
Merge branches 'master' and 'development'
Update README.md
Update README.md
geoanalytics updated
Merge branch 'development' of github.com:hydroshare/hydroshare into development
fixed conflicts between development and master