Merge remote-tracking branch 'noosfero/stable' into distribution-plugin

Conflicts:
	plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb
	plugins/shopping_cart/controllers/shopping_cart_plugin_myprofile_controller.rb
	plugins/shopping_cart/test/functional/shopping_cart_plugin_controller_test.rb
	plugins/shopping_cart/test/functional/shopping_cart_plugin_myprofile_controller_test.rb
	public/stylesheets/application.css
Support enterprise's association through task
Fix cycle creation
Merge branch 'distribution-plugin' into cirandas