fixed ImportError caused by circular reference
Merge branch 'HalloweenBugFixes'
Merge branches 'master' and 'netcdf' of https://github.com/hydroshare/hydroshare into netcdf
stage1.1: basic structure