Revert "Revert "Merge branch 'stable' of https://gitlab.com/noosfero/noosfero into blogoosfero""

This reverts commit 22c6743bc56181b1e1d5c2fe3fc886c412379f6d.