Hopefully this is the very last time we do this.
Conflicts:
Rakefile
app/controllers/my_profile/cms_controller.rb
app/controllers/public/content_viewer_controller.rb
app/helpers/application_helper.rb
app/helpers/content_viewer_helper.rb
app/models/article.rb
app/models/enterprise.rb
app/models/product_categories_block.rb
app/models/products_block.rb
app/views/account/_signup_form.rhtml
app/views/blocks/my_network.rhtml
app/views/blocks/profile_info.rhtml
app/views/blocks/profile_info_actions/_community.html.erb
app/views/blocks/profile_info_actions/_enterprise.html.erb
app/views/blocks/profile_info_actions/_person.html.erb
app/views/content_viewer/view_page.rhtml
app/views/profile/index.rhtml
app/views/shared/_disabled_enterprise.html.erb
app/views/shared/articles_list.html.erb
db/schema.rb
debian/changelog
lib/file_presenter.rb
lib/noosfero.rb
plugins/custom_forms/controllers/custom_forms_plugin_profile_controller.rb
plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb
plugins/shopping_cart/test/functional/shopping_cart_plugin_controller_test.rb
plugins/work_assignment/test/unit/work_assingment_plugin/work_assignment_test.rb
plugins/work_assignment/test/unit/work_assingment_plugin_test.rb
public/javascripts/application.js
script/sample-articles
script/sample-enterprises
script/sample-products
script/sample-profiles
test/functional/cms_controller_test.rb
test/functional/comment_controller_test.rb
test/functional/content_viewer_controller_test.rb
test/unit/application_helper_test.rb
test/unit/article_test.rb
test/unit/content_viewer_helper_test.rb
test/unit/folder_helper_test.rb
test/unit/forum_helper_test.rb