Conflicts:
app/controllers/my_profile/memberships_controller.rb
app/helpers/application_helper.rb
app/helpers/boxes_helper.rb
app/models/article.rb
app/models/category.rb
app/models/change_password.rb
app/models/comment.rb
app/models/environment.rb
app/models/event.rb
app/models/profile.rb
app/models/recent_documents_block.rb
app/models/region.rb
app/models/task.rb
app/models/uploaded_file.rb
app/views/account/forgot_password.html.erb
app/views/events/_events_by_day.html.erb
app/views/profile/_person_profile.html.erb
app/views/shared/_manage_enterprises.html.erb
config/environment.rb
config/initializers/plugins.rb
config/routes.rb
db/schema.rb
debian/control
lib/noosfero/plugin.rb
test/unit/article_test.rb
test/unit/category_test.rb
test/unit/change_password_test.rb
test/unit/cms_helper_test.rb
test/unit/comment_test.rb
test/unit/content_viewer_helper_test.rb
test/unit/event_test.rb
test/unit/folder_helper_test.rb
test/unit/person_test.rb
test/unit/price_detail_test.rb
test/unit/profile_helper_test.rb
test/unit/recent_documents_block_test.rb
test/unit/scrap_test.rb
test/unit/user_mailer_test.rb
vendor/plugins/action_tracker_has_comments/init.rb
vendor/plugins/delayed_job/lib/delayed/worker.rb
vendor/plugins/noosfero_caching/init.rb
