initial commit for dojo6
fixed merge