Put back conditions on catalog edit
Merge branch 'master' of http://github.com/CIRANDAS/noosfero-ecosol into cirandas