Resolving conflicts
Merge branch 'master' of https://github.com/enaguero/donatello
Resolving conflicts