adding concurrency dojo
Merge branch 'master' into dojo1
breaking stuff for dojo