Merged pull request from jfdesjardins2000
Upgraded dojo.color
Solved merge conflicts with develop branch
Merge branch 'legend' into develop
Merged branch 'upgrade_amd' into develop