Conflicts:
app/controllers/my_profile/cms_controller.rb
app/controllers/public/content_viewer_controller.rb
app/helpers/application_helper.rb
app/helpers/article_helper.rb
app/helpers/catalog_helper.rb
app/helpers/comment_helper.rb
app/models/article.rb
app/models/enterprise.rb
app/models/members_block.rb
app/models/person.rb
app/models/profile.rb
app/views/blocks/profile_info.html.erb
app/views/blocks/profile_info_actions/community.html.erb
config/initializers/dependencies.rb
config/routes.rb
db/schema.rb
debian/control
lib/noosfero/plugin.rb
lib/tasks/plugins.rake
plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb
script/sample-products
test/functional/catalog_controller_test.rb
test/functional/manage_products_controller_test.rb
test/functional/map_balloon_controller_test.rb
test/functional/profile_controller_test.rb
test/functional/search_controller_test.rb
test/unit/box_test.rb
test/unit/cms_helper_test.rb
test/unit/enterprise_test.rb
test/unit/environment_test.rb
test/unit/featured_products_block_test.rb
test/unit/person_test.rb
test/unit/product_category_test.rb
test/unit/product_test.rb
test/unit/profile_test.rb
test/unit/user_test.rb
vendor/plugins/monkey_patches/methods_from_fake_arel/init.rb