updated submodules
updated submodules
fix conflict w submodule
updated submodule
Merge branch 'master' of https://github.com/hydroshare/hydroshare2