Unregistered item
Merge branch 'master' of github.com:ESCAMBO/noosfero-ecosol

Conflicts:
	plugins/exchange/views/exchange_plugin_myprofile/_element.html.erb