Merge branch 'stable' of https://github.com/Noosfero/noosfero into stable