removed nonenvironmental data streams from habitat db again
Merge branch 'develop'