Conflicts: app/views/layouts/base_org2.html.erb
Conflicts: db/schema.rb
Conflicts: app/helpers/organizations_helper.rb app/views/organizations/_org_subfield_rightM2.html.erb
Conflicts: db/schema.rb public/stylesheets/org2.css
Conflicts: app/controllers/admin_controller.rb config/routes.rb lib/redmine.rb
guange