Fix duplication on Gemfile
Don't crash if solr is not enabled
Fix assets paths order
Fix add supplier
Merge branch 'distribution-plugin' of https://github.com/rede-gcr/noosfero into distribution-rails3

Conflicts:
	app/models/organization.rb
	app/views/maps/edit_location.rhtml
	config/locales/en.yml
	config/locales/pt.yml
	plugins/orders/models/orders_plugin/order.rb
	plugins/orders/public/stylesheets/orders.css
	plugins/orders/public/stylesheets/orders.scss
	plugins/orders/views/orders_plugin_order/_delivery.html.erb
	plugins/orders/views/orders_plugin_order/_show.html.erb
	plugins/orders_cycle/public/stylesheets/orders_cycle.css
	plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb
	po/pt/noosfero.po
Add plugins migrations paths
Set default timezone as needed by rails 3.2
Edit volunteers periods
Fix layout and multiple creation on periods
Add interface to assign the user as a volunteer
Destroy dependent
Merge branch 'rails3' of git://github.com/CIRANDAS/noosfero-ecosol into cirandas-rails3
Merge branch 'distribution' into cirandas-rails3

Conflicts:
	plugins/orders/views/orders_plugin_order/_delivery.html.erb
	po/pt/noosfero.po