added Dockerfile
Merge branch 'master' of https://github.com/hydroshare/hydroshare2
beta.
Merge branch 'master' of https://github.com/hydroshare/hydroshare2

Conflicts:
	hs_core