added Dockerfile
updated to handle JSON POST body instead of params in views
Update LICENSE.txt
Update LICENSE.txt
Update LICENSE.txt
updated core and theme to match head.  updated ga_resources to handle JSON bodies when necesary
Merge branch 'master' of https://github.com/hydroshare/hydroshare2
Merge branch 'master' of https://github.com/hydroshare/hydroshare2
added some http tests
beta.
Merge branch 'master' of https://github.com/hydroshare/hydroshare2

Conflicts:
	hs_core
Made IrodsStorage the default storage for data.
Added IrodsStorage class and fixed things for iRODS 4.0.2
added django_irods to apps
updated submodules
added django_irods to git
Merge branch 'master' of https://github.com/JeffHeard/django_irods

Conflicts:
	icommands.py
	models.py
	tasks.py
	views.py
updated django_irods
current beta site
Merge branch 'master' of https://github.com/hydroshare/hydroshare2

Conflicts:
	.gitmodules