Fix function scope
Merge branch 'master' of git://github.com/CIRANDAS/noosfero-ecosol into cirandas