Revert "Revert "Merge remote-tracking branch 'origin/master'""

This reverts commit 116d03233991bc8895a5cb7a8a75c8439b22e7f4, reversing
changes made to f6137c7fcc8113b59058b92e360e3fe714f308dd.
Merge branch 'master' of https://github.com/EsfingeFramework/gamification