current beta site
Merge branch 'master' of https://github.com/hydroshare/hydroshare2

Conflicts:
	.gitmodules