Conflicts: app/controllers/organizations_controller.rb app/views/layouts/_footer.html.erb app/views/layouts/base_org.html.erb app/views/organizations/_org_activities.html.erb db/schema.rb public/stylesheets/new_user.css public/stylesheets/org.css public/stylesheets/public.css