--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -1,6 +1,6 @@
 class MessagesController < ApplicationController
 
-  #before_filter :find_project
+  before_filter :find_project
 
   def create
     @message = Message.new(params[:message])
@@ -8,7 +8,8 @@ class MessagesController < ApplicationController
     @message.project_id = @project.id
     if @message.save
       Journal.create(@message, request.env["REMOTE_ADDR"], @project.id, current_user.id).to_s
-      redirect_to project_members_path(@project.slug)
+      redirect_to "/projects/" + @project.slug + "/team/"
+      
     else
       #FIXME this is wrong I think
       flash[:error] = 'Error.'

--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -91,12 +91,7 @@ class ProjectsController < ApplicationController
 
   def team
     @title, @url_suffix = Project.tab_settings(PRJ_TAB_TEAM)
-    @members = Member.find_by_project_alpha(@project.id)
-    if @is_member
-      @messages = Message.find_by_project_user(@project.id, current_user.id, 40)
-    else
-      @messages = Message.find_by_project(@project.id, 40)
-    end
+    @messages = Message.find_by_project(@project.id, 40)
     render :action => "ac_team"
   end
 

--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -5,16 +5,19 @@ class Message < ActiveRecord::Base
   
   protected
   
-  def self.find_by_project_user(project_id, user_id, limit)
-    find(:all,
-         :conditions => ["project_id = '#{project_id}' AND user_id = '#{user_id}'"],
-         :order => "created_at DESC",
-         :limit => limit
-        )
-  end
+  
+  #def self.find_by_project_user(project_id, user_id, limit)
+  #  find(:all,
+  #       :conditions => ["project_id = '#{project_id}' AND user_id = '#{user_id}'"],
+  #       :order => "created_at DESC",
+  #       :limit => limit
+  #      )
+  #end
 
+  #TODO check this include is working  
   def self.find_by_project(project_id, limit)
     find(:all,
+         :include => "user",
          :conditions => ["project_id = '#{project_id}'"],
          :order => "created_at DESC",
          :limit => limit

--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -80,23 +80,23 @@ class Project < ActiveRecord::Base
     (candidate == user) && (repositories.size == 1)
   end
 
-  def tag_list=(tag_list)
-    tag_list.gsub!(",", "")
-
-    super
-  end
+#  def tag_list=(tag_list)
+#    tag_list.gsub!(",", "")
+#
+#    super
+#  end
 
   def home_url=(url)
     self[:home_url] = clean_url(url)
   end
 
-  def mailinglist_url=(url)
-    self[:mailinglist_url] = clean_url(url)
-  end
+#  def mailinglist_url=(url)
+#    self[:mailinglist_url] = clean_url(url)
+#  end
 
-  def bugtracker_url=(url)
-    self[:bugtracker_url] = clean_url(url)
-  end
+#  def bugtracker_url=(url)
+#    self[:bugtracker_url] = clean_url(url)
+#  end
 
   def stripped_description
     description.gsub(/<\/?[^>]*>/, "")

--- a/app/views/messages/_ac_list_messages.html.erb
+++ b/app/views/messages/_ac_list_messages.html.erb
@@ -1,11 +1,9 @@
 <ul>
 <% @messages.each do |m| %>
   <li>
-  <% if show_name %>
   <strong><%= m.user.fullname %></strong>
-  <% end %>
   <%= m.activity %>
   <span class='small_grey'>(<%= time_ago_in_words(m.created_at) %> ago)</span>
   </li>
 <% end %>
-</ul>
\ No newline at end of file
+</ul>

--- a/app/views/messages/_ac_right_actionbox_post_message.html.erb
+++ b/app/views/messages/_ac_right_actionbox_post_message.html.erb
@@ -1,7 +1,7 @@
 
 <table class='right_input'>
 <tr><td>
-<% form_for :message, :url => project_members_path(@project.slug), :method => :post, :html => {:name => 'postmessage', :id => 'input'} do |f| -%>
+<% form_for :message, :url => project_messages_path(@project.slug), :method => :post, :html => {:name => 'postmessage', :id => 'input'} do |f| -%>
   
   <label>Message:</label>
   <%= f.text_area(:activity, :rows => 2) -%>

--- a/app/views/projects/ac_team.html.erb
+++ b/app/views/projects/ac_team.html.erb
@@ -3,22 +3,11 @@
                                                          :project => @project,
                                                          :pagetitle => @title } %>
 
-<% if @is_member && !@members.empty? %>
-<div id='projectmembers'>
-<ul>
-<% @members.each do |m| %>
-  <% if m.user != current_user %>
-  <li><%= m.user.fullname %></li>
-  <% end %>
-<% end %>
-</ul>
-</div>
-<% end %>
-  
+
 <%= div_formattedtext_open %>
 
 <h4>Recent Messages</h4>
-<%= render :partial => "messages/ac_list_messages", :locals => { :show_name => !@is_member } %>
+<%= render :partial => "messages/ac_list_messages", :locals => { :show_name => true } %>
 
 <%= div_formattedtext_close %>
 

--- a/app/views/repositories/ac_index.html.erb
+++ b/app/views/repositories/ac_index.html.erb
@@ -1,3 +1,4 @@
+<% meta_noindex %>
 <% meta_nofollow %>
 
 <%= render :partial => "projects/ac_project_header", :locals => { :tab => PRJ_TAB_GIT, :subtab => PRJ_TAB_SUBTAB_NONE, :project => @project, :pagetitle => @title } %>

--- a/app/views/searches/ac_search.html.erb
+++ b/app/views/searches/ac_search.html.erb
@@ -1,3 +1,6 @@
+<% meta_noindex %>
+<% meta_nofollow %>
+
 <% title "Search" %>
 
 <%= div_breadcrumb_open %>

--- a/app/views/site/dashboard.html.erb
+++ b/app/views/site/dashboard.html.erb
@@ -1,3 +1,6 @@
+<% meta_noindex %>
+<% meta_nofollow %>
+
 <% @page_title = "#{current_user.login}'s dashboard" -%>
 
 <div id="recent_comments">

--- a/app/views/trees/ac_show.html.erb
+++ b/app/views/trees/ac_show.html.erb
@@ -1,3 +1,6 @@
+<% meta_noindex %>
+<% meta_nofollow %>
+
 <%= render :partial => "projects/ac_project_header", :locals => { :tab => PRJ_TAB_GIT, :subtab => PRJ_TAB_GIT_TREE, :project => @project, :pagetitle => @title } %>
 
 <%= breadcrumb_path(@repository.name, @commit.id) -%>

--- a/public/stylesheets/base.css
+++ b/public/stylesheets/base.css
@@ -259,8 +259,6 @@ table.progress td { background: #fff; padding: 0 }
 table.progress td.closed { background: #bae0ba }
 table.progress td :hover { background: none }
 
-/* Project members */
-#projectmembers { border: 1px black solid; width: 320px; margin-top: 0px; margin-right: 0px; float: right; display: inline; }