Revert "Merge branch 'master' of https://gitlab.com/noosfero/noosfero into cirandas-rails3"

This reverts commit 77c3ddd611ddb38c5941a7954d6e723b0d27df70, reversing
changes made to 5336aeb9179cf30b911f4964b7aac663c58c28f2.