Merge remote-tracking branch 'origin/master' into import-fbes
Fixing scripts for FBES import
Merge branch 'import-fbes' of https://github.com/caioformiga/noosfero-ecosol