Removed submodules
Updated dojo repositories
Fixed unit test, missing template parameters