gistfile1.txt

# On branch rails3_taxonomy_mashup
# Changes to be committed:
#
#	modified:   app/controllers/admin/accounts_controller.rb
#	new file:   app/controllers/admin/industry_compositions_controller.rb
#	new file:   app/controllers/admin/industry_segment_categories_controller.rb
#	new file:   app/controllers/admin/industry_statements_controller.rb
#	new file:   app/controllers/admin/industry_taxonomies_controller.rb
#	modified:   app/controllers/admin/segments_controller.rb
#	new file:   app/controllers/admin/statement_customizations_controller.rb
#	modified:   app/controllers/admin/time_windows_controller.rb
#	modified:   app/controllers/application_controller.rb
#	modified:   app/controllers/data_summary_controller.rb
#	modified:   app/controllers/performance_controller.rb
#	modified:   app/controllers/reports_controller.rb
#	modified:   app/controllers/share_controller.rb
#	modified:   app/controllers/tutorials_controller.rb
#	modified:   app/controllers/xy_plotter_controller.rb
#	new file:   app/helpers/admin/industry_taxonomy_helper.rb
#	modified:   app/helpers/application_helper.rb
#	modified:   app/helpers/projects_helper.rb
#	new file:   app/helpers/segment_helper.rb
#	modified:   app/models/attitudinal_segment.rb
#	modified:   app/models/chart_setting.rb
#	modified:   app/models/core_calculation.rb
#	modified:   app/models/data_processor.rb
#	modified:   app/models/emotion.rb
#	modified:   app/models/experience.rb
#	modified:   app/models/explorer_setting.rb
#	modified:   app/models/goal.rb
#	new file:   app/models/industry_account.rb
#	new file:   app/models/industry_brand_entity.rb
#	new file:   app/models/industry_competition.rb
#	new file:   app/models/industry_composition.rb
#	new file:   app/models/industry_segment_category.rb
#	new file:   app/models/industry_statement.rb
#	new file:   app/models/industry_taxonomy.rb
#	new file:   app/models/industry_time_window.rb
#	new file:   app/models/industry_user.rb
#	modified:   app/models/metric.rb
#	modified:   app/models/standard_time_window.rb
#	new file:   app/models/statement_customization.rb
#	modified:   app/models/supporting_message.rb
#	modified:   app/models/survey_response.rb
#	new file:   app/models/tools/report.rb
#	new file:   app/models/tools/tool_base.rb
#	modified:   app/views/accounts/partials/_brands_user.html.erb
#	modified:   app/views/accounts/partials/_brands_user_form.html.erb
#	modified:   app/views/admin/account_users/show.html.erb
#	modified:   app/views/admin/custom_questions/edit.html.erb
#	modified:   app/views/admin/custom_questions/show.html.erb
#	modified:   app/views/admin/emotions/edit.html.erb
#	modified:   app/views/admin/emotions/show.html.erb
#	modified:   app/views/admin/goals/show.html.erb
#	new file:   app/views/admin/industry_compositions/create.rjs
#	new file:   app/views/admin/industry_compositions/destroy.rjs
#	new file:   app/views/admin/industry_statements/_form.html.haml
#	new file:   app/views/admin/industry_taxonomies/_attitudinal_segments_table.html.haml
#	new file:   app/views/admin/industry_taxonomies/_brand.html.haml
#	new file:   app/views/admin/industry_taxonomies/_competitors_table.html.haml
#	new file:   app/views/admin/industry_taxonomies/_form.html.haml
#	new file:   app/views/admin/industry_taxonomies/_form_alias.html.haml
#	new file:   app/views/admin/industry_taxonomies/_segment_list.html.haml
#	new file:   app/views/admin/industry_taxonomies/_segment_section.html.haml
#	new file:   app/views/admin/industry_taxonomies/_statement_list.html.haml
#	new file:   app/views/admin/industry_taxonomies/_statement_section.html.haml
#	new file:   app/views/admin/industry_taxonomies/composition_partial/_composition_row.html.haml
#	new file:   app/views/admin/industry_taxonomies/composition_partial/_composition_table.html.haml
#	new file:   app/views/admin/industry_taxonomies/edit.html.haml
#	new file:   app/views/admin/industry_taxonomies/form/_selection_box.html.haml
#	new file:   app/views/admin/industry_taxonomies/index.html.haml
#	new file:   app/views/admin/industry_taxonomies/new.html.haml
#	new file:   app/views/admin/industry_taxonomies/segment/_associated_segment_table.html.haml
#	new file:   app/views/admin/industry_taxonomies/segment/_inherited_segment_table.html.haml
#	new file:   app/views/admin/industry_taxonomies/show.html.haml
#	new file:   app/views/admin/industry_taxonomies/statement/_associated_statement_table.html.haml
#	new file:   app/views/admin/industry_taxonomies/statement/_inherited_statement_table.html.haml
#	modified:   app/views/admin/segments/_form.html.erb
#	new file:   app/views/admin/segments/_industry_taxonomy.html.erb
#	new file:   app/views/admin/statement_customizations/_form.html.haml
#	modified:   app/views/admin/supporting_messages/show.html.erb
#	modified:   app/views/admin/time_windows/index.html.erb
#	modified:   app/views/admin/users/_fields.html.erb
#	modified:   app/views/chart_tools/index.html.erb
#	modified:   app/views/data_summary/statements.html.erb
#	modified:   app/views/layouts/admin.html.erb
#	modified:   app/views/ownership_analytic/_basic_settings.html.erb
#	modified:   app/views/ownership_analytic/_chart.html.erb
#	modified:   app/views/ownership_analytic/popup_partials/_timeframes.html.erb
#	modified:   app/views/performance/_basic_settings.html.erb
#	modified:   app/views/performance/chart_data.builder
#	modified:   app/views/performance/popup_partials/_timeframes.html.erb
#	deleted:    app/views/query_tool/popup_partials/_brand.erb
#	new file:   app/views/query_tool/popup_partials/_brand.html.haml
#	modified:   app/views/query_tool/popup_partials/_consumer_type.erb
#	modified:   app/views/query_tool/popup_partials/_segment.erb
#	modified:   app/views/query_tool/popup_partials/_time_frame.erb
#	modified:   app/views/query_tool/print/_result_table.html.erb
#	modified:   app/views/query_tool/print/popup_partials/_brand.erb
#	modified:   app/views/query_tool/print/popup_partials/_consumer_type.erb
#	modified:   app/views/query_tool/print/popup_partials/_segment.erb
#	modified:   app/views/query_tool/print/popup_partials/_time_frame.erb
#	modified:   app/views/query_tool/result_partials/_result_table.html.erb
#	modified:   app/views/reports/motivations/_result.html.erb
#	modified:   app/views/reports/motivations/motivations.csv.erb
#	modified:   app/views/reports/popup_partials/_goals.html.erb
#	modified:   app/views/reports/popup_partials/_motivations.html.erb
#	modified:   app/views/reports/popup_partials/_time_windows.html.erb
#	modified:   app/views/reports/print/motivations.html.erb
#	modified:   app/views/reports/print/supporting_messages.html.erb
#	modified:   app/views/reports/print/touch_points.html.erb
#	modified:   app/views/reports/shared/_basic_settings.html.erb
#	modified:   app/views/reports/shared/_chart_steps.html.erb
#	modified:   app/views/reports/supporting_messages/_result.html.erb
#	modified:   app/views/reports/supporting_messages/_result_table.html.erb
#	modified:   app/views/reports/supporting_messages/supporting_messages.csv.erb
#	modified:   app/views/reports/touch_points/_result.html.erb
#	modified:   app/views/reports/touch_points/touch_points.csv.erb
#	modified:   app/views/shared/_data_size_viewer.html.erb
#	modified:   app/views/shared/_sample_size_table.csv.erb
#	modified:   app/views/shared/print/_data_size_viewer.erb
#	deleted:    chromedriver.log
#	modified:   config/environments/cucumber.rb
#	modified:   config/newrelic.yml
#	new file:   config/preinitializer.rb
#	modified:   config/routes.rb
#	new file:   db/migrate/20120206095518_create_industry_taxonomies.rb
#	new file:   db/migrate/20120207045504_create_industry_brand_entities.rb
#	new file:   db/migrate/20120207094105_create_industry_compositions.rb
#	new file:   db/migrate/20120207094227_create_industry_competitions.rb
#	new file:   db/migrate/20120207094300_add_taxonomy_id_to_brand_sector.rb
#	new file:   db/migrate/20120207094313_migrate_industry_taxonomy.rb
#	new file:   db/migrate/20120208085614_migrate_industry_composition.rb
#	new file:   db/migrate/20120208091445_migrate_industry_competition.rb
#	new file:   db/migrate/20120221073854_create_industry_statements.rb
#	new file:   db/migrate/20120221093535_migrate_statement_to_industry_taxonomy.rb
#	new file:   db/migrate/20120229023936_create_industry_segment_categories.rb
#	new file:   db/migrate/20120229025026_migrate_industry_segment_category.rb
#	new file:   db/migrate/20120229095254_modify_attitudinal_segment.rb
#	new file:   db/migrate/20120306095008_create_industry_accounts.rb
#	new file:   db/migrate/20120306100653_create_industry_users.rb
#	new file:   db/migrate/20120306105654_add_taxonomy_id_to_explorer_setting.rb
#	new file:   db/migrate/20120308101350_add_industry_taxonomy_id_to_survey_response.rb
#	new file:   db/migrate/20120309085624_add_industry_taxonomy_id_to_metric.rb
#	new file:   db/migrate/20120313044448_add_industry_taxonomy_id_to_sample_counter.rb
#	new file:   db/migrate/20120319101622_add_industry_taxonomy_id_to_segment.rb
#	new file:   db/migrate/20120322040737_migrate_favorites.rb
#	new file:   db/migrate/20120327101200_create_statement_customizations.rb
#	new file:   db/migrate/20120327102057_migrate_statement_customization.rb
#	new file:   db/migrate/20120328035515_cleanup_industry_statement.rb
#	new file:   db/migrate/20120426091439_create_industry_time_windows.rb
#	new file:   db/migrate/20120508083512_add_quarter_management_to_industry_account.rb
#	new file:   db/migrate/20120509091119_change_connection_level_of_survey_response.rb
#	new file:   lib/tasks/industry_taxonomy.rake
#	modified:   lib/utils.rb
#	new file:   public/images/border1.png
#	new file:   public/images/border2.png
#	new file:   public/javascripts/admin/show_industry_taxonomy.js
#	new file:   public/javascripts/industry_taxonomy.js
#	new file:   public/javascripts/jquery.contextMenu-custom.js
#	new file:   public/javascripts/jquery.dynatree.js
#	modified:   public/javascripts/tools/reports.js
#	modified:   public/stylesheets/admin.css
#	new file:   public/stylesheets/jquery.contextMenu.css
#	new file:   public/stylesheets/skin-custom/custom.css
#	new file:   public/stylesheets/skin-custom/customDoc1.gif
#	new file:   public/stylesheets/skin-custom/customDoc2.gif
#	new file:   public/stylesheets/skin-custom/customFolder1.gif
#	new file:   public/stylesheets/skin-custom/doc_with_children.gif
#	new file:   public/stylesheets/skin-custom/folder_docs.gif
#	new file:   public/stylesheets/skin-custom/folder_images.gif
#	new file:   public/stylesheets/skin-custom/folder_page.gif
#	new file:   public/stylesheets/skin/icons.gif
#	new file:   public/stylesheets/skin/icons_backup.gif
#	new file:   public/stylesheets/skin/loading.gif
#	new file:   public/stylesheets/skin/ui.dynatree.css
#	new file:   public/stylesheets/skin/vline.gif
#	new file:   public/stylesheets/ui.dynatree.css
#	modified:   spec/controllers/admin/automated_tests_controller_spec.rb
#	deleted:    spec/controllers/admin/brand_statements_controller_spec.rb
#	deleted:    spec/controllers/admin/brands_controller_spec.rb
#	modified:   spec/controllers/admin/calc_verification_controller_spec.rb
#	modified:   spec/controllers/admin/comments_controller_spec.rb
#	modified:   spec/controllers/admin/custom_questions_controller_spec.rb
#	deleted:    spec/controllers/admin/dummy_brands_controller_spec.rb
#	modified:   spec/controllers/admin/emotions_controller_spec.rb
#	modified:   spec/controllers/admin/excluded_statements_controller_spec.rb
#	modified:   spec/controllers/admin/experiences_controller_spec.rb
#	modified:   spec/controllers/admin/export_data_controller_spec.rb
#	deleted:    spec/controllers/admin/favorites_controller_spec.rb
#	modified:   spec/controllers/admin/glossary_terms_controller_spec.rb
#	modified:   spec/controllers/admin/goals_controller_spec.rb
#	modified:   spec/controllers/admin/imports_controller_spec.rb
#	modified:   spec/controllers/admin/included_parameters_controller_spec.rb
#	deleted:    spec/controllers/admin/industries_controller_spec.rb
#	new file:   spec/controllers/admin/industry_compositions_controller_spec.rb
#	new file:   spec/controllers/admin/industry_statements_controller_spec.rb
#	new file:   spec/controllers/admin/industry_taxonomies_controller_spec.rb
#	modified:   spec/controllers/admin/pages_controller_spec.rb
#	deleted:    spec/controllers/admin/parameter_or_statement_sectors_controller_spec.rb
#	modified:   spec/controllers/admin/parameters_controller_spec.rb
#	new file:   spec/controllers/admin/statement_customizations_controller_spec.rb
#	modified:   spec/controllers/admin/supporting_messages_controller_spec.rb
#	modified:   spec/controllers/admin/system_messages_controller_spec.rb
#	modified:   spec/controllers/admin/time_windows_controller_spec.rb
#	modified:   spec/controllers/admin/users_controller_spec.rb
#	modified:   spec/controllers/amcharts/ac_exporter_controller_spec.rb
#	modified:   spec/controllers/comments_controller_spec.rb
#	modified:   spec/controllers/custom_segments_controller_spec.rb
#	modified:   spec/controllers/data_summary_controller_spec.rb
#	modified:   spec/controllers/explorer_settings_controller_spec.rb
#	modified:   spec/controllers/favorite_notes_controller_spec.rb
#	modified:   spec/controllers/folders_controller_spec.rb
#	modified:   spec/controllers/glossary_controller_spec.rb
#	modified:   spec/controllers/help_controller_spec.rb
#	modified:   spec/controllers/home_controller_spec.rb
#	modified:   spec/controllers/projects_controller_spec.rb
#	modified:   spec/controllers/query_tool_controller_spec.rb
#	modified:   spec/controllers/reports_controller_spec.rb
#	modified:   spec/controllers/share_controller_spec.rb
#	modified:   spec/controllers/tools_controller_spec.rb
#	modified:   spec/controllers/tutorials_controller_spec.rb
#	modified:   spec/controllers/users_controller_spec.rb
#	modified:   spec/controllers/xy_plotter_controller_spec.rb
#	modified:   spec/factories/accounts.rb
#	modified:   spec/factories/attitudinal_segments.rb
#	modified:   spec/factories/explorer_settings.rb
#	new file:   spec/factories/industry_accounts.rb
#	new file:   spec/factories/industry_brand_entities.rb
#	new file:   spec/factories/industry_competitions.rb
#	new file:   spec/factories/industry_segment_categories.rb
#	new file:   spec/factories/industry_statements.rb
#	new file:   spec/factories/industry_taxonomies.rb
#	new file:   spec/factories/industry_users.rb
#	modified:   spec/factories/segments.rb
#	new file:   spec/factories/statement_customizations.rb
#	modified:   spec/factories/statements.rb
#	modified:   spec/factories/survey_responses.rb
#	modified:   spec/factories/users.rb
#	new file:   spec/helpers/admin/industry_taxonomy_spec.rb
#	modified:   spec/helpers/application_helper_spec.rb
#	modified:   spec/helpers/projects_helper_spec.rb
#	new file:   spec/helpers/segment_helper_spec.rb
#	new file:   spec/integration/admin/manage_account_brands.rb
#	new file:   spec/integration/admin/manage_account_users.rb
#	new file:   spec/integration/admin/manage_accounts.rb
#	new file:   spec/integration/admin/manage_admins.rb
#	new file:   spec/integration/admin/view_industry_taxonomy_tree.rb
#	new file:   spec/integration/run_motivation.rb
#	new file:   spec/integration/run_ownership_analytic.rb
#	new file:   spec/integration/run_performance.rb
#	new file:   spec/integration/run_query_tool.rb
#	new file:   spec/integration/run_supporting_message.rb
#	new file:   spec/integration/run_touch_point.rb
#	new file:   spec/integration/run_xy_plotter.rb
#	deleted:    spec/libs/confident_score_calculator_spec.rb
#	deleted:    spec/libs/statistic_spec.rb
#	deleted:    spec/libs/utils_spec.rb
#	deleted:    spec/models/accounts_brand_spec.rb
#	deleted:    spec/models/accounts_dummy_brand_spec.rb
#	modified:   spec/models/admin/automated_test_spec.rb
#	modified:   spec/models/admin_message_notification_spec.rb
#	modified:   spec/models/attitudinal_segment_option_parameters_spec.rb
#	modified:   spec/models/attitudinal_segment_options_spec.rb
#	modified:   spec/models/attitudinal_segment_weight_variations_spec.rb
#	modified:   spec/models/attitudinal_segments_spec.rb
#	modified:   spec/models/background_process_spec.rb
#	deleted:    spec/models/brand_competitor_spec.rb
#	modified:   spec/models/brand_distinction_spec.rb
#	deleted:    spec/models/brand_segment_category_spec.rb
#	deleted:    spec/models/brand_statement_spec.rb
#	deleted:    spec/models/brands_user_spec.rb
#	modified:   spec/models/calc_verification_spec.rb
#	modified:   spec/models/comment_spec.rb
#	modified:   spec/models/configuration_spec.rb
#	modified:   spec/models/core_calculation_spec.rb
#	modified:   spec/models/custom_question_spec.rb
#	modified:   spec/models/data_processor_spec.rb
#	modified:   spec/models/data_summary_spec.rb
#	modified:   spec/models/emotion_spec.rb
#	modified:   spec/models/excluded_statement_spec.rb
#	modified:   spec/models/experience_spec.rb
#	modified:   spec/models/explorer_setting_spec.rb
#	modified:   spec/models/faq_section_spec.rb
#	modified:   spec/models/favorite_content_spec.rb
#	modified:   spec/models/favorite_node_spec.rb
#	modified:   spec/models/favorite_spec.rb
#	modified:   spec/models/goal_spec.rb
#	modified:   spec/models/import_spec.rb
#	modified:   spec/models/included_parameter_spec.rb
#	new file:   spec/models/industry_account_spec.rb
#	new file:   spec/models/industry_brand_entity_spec.rb
#	new file:   spec/models/industry_competition_spec.rb
#	new file:   spec/models/industry_composition_spec.rb
#	new file:   spec/models/industry_segment_category_spec.rb
#	new file:   spec/models/industry_statement_spec.rb
#	new file:   spec/models/industry_taxonomy_spec.rb
#	new file:   spec/models/industry_time_window_spec.rb
#	new file:   spec/models/industry_user_spec.rb
#	modified:   spec/models/mailer_spec.rb
#	modified:   spec/models/metric_spec.rb
#	deleted:    spec/models/negative_parameter_or_statement_sector_spec.rb
#	deleted:    spec/models/parameter_or_statement_sector_spec.rb
#	modified:   spec/models/parameter_spec.rb
#	deleted:    spec/models/projects_spec.rb
#	modified:   spec/models/safety_and_satisfaction_spec.rb
#	modified:   spec/models/sample_counter_spec.rb
#	deleted:    spec/models/sectors_segment_category_spec.rb
#	modified:   spec/models/segment_category_spec.rb
#	modified:   spec/models/segment_condition_spec.rb
#	modified:   spec/models/segment_group_spec.rb
#	new file:   spec/models/standard_time_window_spec.rb
#	new file:   spec/models/statement_customization_spec.rb
#	modified:   spec/models/supporting_message_spec.rb
#	modified:   spec/models/survey_responses_spec.rb
#	modified:   spec/models/tools/ownership_spec.rb
#	new file:   spec/models/tools/report_spec.rb
#	modified:   spec/models/tools/xy_plotter_spec.rb
#	new file:   spec/support/capybara.rb
#	new file:   spec/support/dynatree.rb
#	modified:   spec/support/init_commons.rb
#	new file:   spec/support/switch_window.rb
#	new file:   spec/support/waiter.rb
#	new file:   test/unit/industry_composition_test.rb
#	new file:   vendor/plugins/rails_upgrade/MIT-LICENSE
#	new file:   vendor/plugins/rails_upgrade/README.rdoc
#	new file:   vendor/plugins/rails_upgrade/Rakefile
#	new file:   vendor/plugins/rails_upgrade/init.rb
#	new file:   vendor/plugins/rails_upgrade/install.rb
#	new file:   vendor/plugins/rails_upgrade/lib/application_checker.rb
#	new file:   vendor/plugins/rails_upgrade/lib/gemfile_generator.rb
#	new file:   vendor/plugins/rails_upgrade/lib/new_configuration_generator.rb
#	new file:   vendor/plugins/rails_upgrade/lib/rails_upgrade.rb
#	new file:   vendor/plugins/rails_upgrade/lib/routes_upgrader.rb
#	new file:   vendor/plugins/rails_upgrade/lib/tasks/rails_upgrade_tasks.rake
#	new file:   vendor/plugins/rails_upgrade/test/application_checker_test.rb
#	new file:   vendor/plugins/rails_upgrade/test/gemfile_generator_test.rb
#	new file:   vendor/plugins/rails_upgrade/test/new_configuration_generator_test.rb
#	new file:   vendor/plugins/rails_upgrade/test/routes_upgrader_test.rb
#	new file:   vendor/plugins/rails_upgrade/test/test_helper.rb
#
# Unmerged paths:
#   (use "git add/rm <file>..." as appropriate to mark resolution)
#
#	both modified:      .gitignore
#	both added:         Gemfile
#	both added:         Gemfile.lock
#	both modified:      Rakefile
#	both modified:      app/controllers/accounts_controller.rb
#	both modified:      app/controllers/ownership_analytic_controller.rb
#	both modified:      app/controllers/query_tool_controller.rb
#	both modified:      app/models/account.rb
#	both modified:      app/models/brand.rb
#	both modified:      app/models/data_summary.rb
#	both modified:      app/models/favorite_image.rb
#	both modified:      app/models/report.rb
#	both modified:      app/models/sample_counter.rb
#	both modified:      app/models/segment.rb
#	both modified:      app/models/segment_category.rb
#	both modified:      app/models/statement.rb
#	both modified:      app/models/terms_of_use.rb
#	both modified:      app/models/time_window.rb
#	both modified:      app/models/tools/ownership.rb
#	both modified:      app/models/tools/performance.rb
#	both modified:      app/models/tools/query_tool.rb
#	both modified:      app/models/tools/xy_plotter.rb
#	both modified:      app/models/user.rb
#	both modified:      app/views/accounts/partials/_user_form.html.erb
#	both modified:      app/views/admin/accounts/_brands_table.erb
#	both modified:      app/views/admin/accounts/_brands_table_form.erb
#	both modified:      app/views/admin/accounts/_form.html.erb
#	both modified:      app/views/admin/accounts/show.html.erb
#	both modified:      app/views/admin/custom_questions/_form.html.erb
#	both modified:      app/views/admin/custom_questions/index.html.erb
#	both modified:      app/views/admin/emotions/_form.html.erb
#	both modified:      app/views/admin/emotions/_statements_table.html.erb
#	both modified:      app/views/admin/goals/_form.html.erb
#	both modified:      app/views/admin/goals/index.html.erb
#	deleted by them:    app/views/admin/segments/_brand.html.erb
#	deleted by them:    app/views/admin/segments/_sector.html.erb
#	both modified:      app/views/admin/segments/_segment_positions.html.erb
#	both modified:      app/views/admin/segments/index.html.erb
#	both modified:      app/views/admin/segments/show.html.erb
#	both modified:      app/views/admin/supporting_messages/_form.html.erb
#	both modified:      app/views/admin/time_windows/_form.html.erb
#	both added:         app/views/ownership_analytic/ownership_report.csv.erb
#	both modified:      app/views/pages/terms_of_use.html.erb
#	both modified:      app/views/query_tool/query_report.csv.erb
#	both modified:      app/views/reports/shared/_result_header.html.erb
#	both modified:      app/views/xy_plotter/_basic_settings.html.erb
#	both modified:      config/boot.rb
#	both modified:      config/environment.rb
#	both modified:      config/environments/test.rb
#	deleted by them:    lib/tasks/rcov.rake
#	added by us:        public/images/rails.png
#	both modified:      public/javascripts/admin.js
#	both added:         public/javascripts/paging.js
#	both modified:      public/javascripts/result.js
#	both modified:      public/stylesheets/account_admin.css
#	both modified:      spec/controllers/accounts_controller_spec.rb
#	both modified:      spec/controllers/admin/accounts_controller_spec.rb
#	both modified:      spec/controllers/admin/attitudinal_segments_controller_spec.rb
#	both modified:      spec/controllers/admin/configurations_controller_spec.rb
#	both modified:      spec/controllers/admin/faq_controller_spec.rb
#	deleted by them:    spec/controllers/admin/sectors_controller_spec.rb
#	both modified:      spec/controllers/admin/segments_controller_spec.rb
#	both modified:      spec/controllers/ownership_analytic_controller_spec.rb
#	both modified:      spec/controllers/performance_controller_spec.rb
#	both modified:      spec/controllers/results_controller_spec.rb
#	both modified:      spec/helpers/favorites_helper_spec.rb
#	deleted by us:      spec/lib/clearance_spec.rb
#	both modified:      spec/lib/prince_spec.rb
#	both modified:      spec/models/account_spec.rb
#	deleted by them:    spec/models/brand_spec.rb
#	deleted by them:    spec/models/dummy_brand_spec.rb
#	both modified:      spec/models/favorite_image_spec.rb
#	both modified:      spec/models/project_spec.rb
#	both modified:      spec/models/report_spec.rb
#	deleted by them:    spec/models/sector_spec.rb
#	both modified:      spec/models/segment_spec.rb
#	both modified:      spec/models/statement_spec.rb
#	both modified:      spec/models/time_window_spec.rb
#	both modified:      spec/models/tools/performance_spec.rb
#	both modified:      spec/models/tools/query_tool_spec.rb
#	both modified:      spec/models/user_spec.rb
#	both modified:      spec/spec_helper.rb
#	added by them:      vendor/plugins/rails_upgrade/uninstall.rb