Better support for plugins migrations
Add STI, serialized field and rename enterprise_id
Add archived field to products
Allow toggle of name uniqueness on subtypes
Allow toggle of name uniqueness on subtypes
Alias enterprise methods
boxes-helper: add params to context passed to the block
block: add support for custom display modes for blocks
product-categories-block: add 'catalog_only' option and define it as default
Merge commit 'refs/merge-requests/342' of git://gitorious.org/noosfero/noosfero into merge-requests/342

Conflicts:
	plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb
fix: catalog configuration only for enterprises

(ActionItem896)
Merge branch 'master_colivre' into stable