estado no final do dojo
Merge remote-tracking branch 'origin/master'