Merge branch 'AI2794' of https://github.com/dtygel/noosfero-ecosol into ai2794

Conflicts:
	config/environment.rb
Merge branch 'ai2794' into cirandas