added supporting scaffolding for supporting beta and dev in fig
added party model. updated hydroshare to modern project layout.  created dev.hydroshare.org and beta.hydroshare.org fig.ymls
fixed settings
updated requirements in hs_docker_base
Merge branch 'master' of https://github.com/hydroshare/hydroshare2
updated to fig and docker
added resource aggregation resource type
added ref time series res type
updated dev db
Merge branch 'hong' of https://github.com/hydroshare/hydroshare2 into hong

Conflicts:
	hydroshare/settings.py
	urls.py