Removed submodules
Updated dojo repositories
Fixed unit test, missing template parameters
Merge pull request #5 from juanpicado/master

Merge from juanpicado repository