Remove monkey patch not needed anymore
Fix margins logic
Merge branch 'distribution-plugin' of git://github.com/coletivoEITA/noosfero-ecosol into cirandas