Remove monkey patch not needed anymore
Fix margins logic
Remove wrong merge part from gemfile
Merge branch 'distribution-plugin' of git://github.com/coletivoEITA/noosfero-ecosol into cirandas
Script for import enterprises using specific .CSV file.
Using mokey patch for User::Mailer deliver script_welcome_enterprise
Fixxing person data creation
Merge branch 'import-fbes' of git://github.com/caioformiga/noosfero-ecosol into import-fbes

Conflicts:
	Gemfile
	app/views/user/mailer/script_welcome_email.html.erb
	script/import-enterprises