diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 83a4dfd19..2c689e277 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1354,7 +1354,7 @@ module ApplicationHelper
 #added by nie
 # Display watcher picture
   def show_more_watchers?(obj)
-    if User.watched_by(obj.id).count > 12
+    if User.watched_by(obj.id).count > 6
       return true
     else
       return false
diff --git a/app/views/bids/_new.html.erb b/app/views/bids/_new.html.erb
index d57a26d72..5250a361d 100644
--- a/app/views/bids/_new.html.erb
+++ b/app/views/bids/_new.html.erb
@@ -75,8 +75,8 @@
 <%= f.text_field :reference_user_id, :style=>"display:none"%>
 <table border="0" width="525px" align="center">
 	<tr>
-		<td align="right"> <%= submit_tag l(:button_leave_meassge), :name => nil , :class => "bid_btn", :onmouseout => "this.style.backgroundPosition = 'left top'", :onmouseover => "this.style.backgroundPosition = 'left -31px'"%>
-		<%= submit_tag l(:button_clear_requirement), :name => nil, :onclick => "clearMessage('bid_message_message');", :type => 'button', :class => "bid_btn", :onmouseout => "this.style.backgroundPosition = 'left top'", :onmouseover => "this.style.backgroundPosition = 'left -31px'" %> </td>
+		<td align="right"> <%= submit_tag l(:button_leave_meassge), :name => nil , :class => "enterprise" %>
+		<%= submit_tag l(:button_clear_requirement), :name => nil, :onclick => "clearMessage('bid_message_message');", :type => 'button', :class => "btn_bid"  %> </td>
 	</tr>
 </table>
 <% else %>
diff --git a/app/views/bids/show_project.html.erb b/app/views/bids/show_project.html.erb
index 804602c35..05e9771d0 100644
--- a/app/views/bids/show_project.html.erb
+++ b/app/views/bids/show_project.html.erb
@@ -92,11 +92,11 @@
 			<% end %>			
 			<tr>
 				<td align="right">
-				<%= submit_tag l(:button_add), :name => nil , :class => "bid_btn",
+				<%= submit_tag l(:button_add), :name => nil , :class => "btn_bid",
 				 :onmouseout => "this.style.backgroundPosition = 'left top'",
 				  :onmouseover => "this.style.backgroundPosition = 'left -30px'"%>
 				<%= submit_tag l(:button_cancel), :name => nil, :onclick => "cancel();", 
-				:type => 'button', :class => "bid_btn", :onmouseout => "this.style.backgroundPosition = 'left top'",
+				:type => 'button', :class => "btn_bid", :onmouseout => "this.style.backgroundPosition = 'left top'",
 				:onmouseover => "this.style.backgroundPosition = 'left -30px'" %> 
 				</td>
 			</tr>
diff --git a/app/views/bids/show_project_homework.html.erb b/app/views/bids/show_project_homework.html.erb
index ba0b99283..6b27d01b8 100644
--- a/app/views/bids/show_project_homework.html.erb
+++ b/app/views/bids/show_project_homework.html.erb
@@ -72,8 +72,8 @@
       :value => "#{l(:label_bid_reason)}", :style => "resize: none;", :class => 'noline'%></td>
 		</tr>
 		<tr>
-			<td align="right"><%= submit_tag l(:button_add), :name => nil , :class => "bid_btn", :onmouseout => "this.style.backgroundPosition = 'left top'", :onmouseover => "this.style.backgroundPosition = 'left -30px'"%>
-			<%= submit_tag l(:button_cancel), :name => nil, :onclick => "cancel();", :type => 'button', :class => "bid_btn", :onmouseout => "this.style.backgroundPosition = 'left top'",
+			<td align="right"><%= submit_tag l(:button_add), :name => nil , :class => "btn_bid", :onmouseout => "this.style.backgroundPosition = 'left top'", :onmouseover => "this.style.backgroundPosition = 'left -30px'"%>
+			<%= submit_tag l(:button_cancel), :name => nil, :onclick => "cancel();", :type => 'button', :class => "btn_bid", :onmouseout => "this.style.backgroundPosition = 'left top'",
 			:onmouseover => "this.style.backgroundPosition = 'left -30px'" %> </td>
 		</tr>
 	</table>
diff --git a/app/views/layouts/base_contest.html.erb b/app/views/layouts/base_contest.html.erb
index a30dc6fb0..200a47a7b 100644
--- a/app/views/layouts/base_contest.html.erb
+++ b/app/views/layouts/base_contest.html.erb
@@ -110,7 +110,7 @@
 											<table>
 												<tr>
 													<td style="padding-top: 5px">
-														<% if @bid.watcher_users.size>0 %>
+														<% if @bid.watcher_users.size>0 && @bid.watcher_users.count<13%>
 															<% for user in @bid.watcher_users%>
 																<%= link_to image_tag(url_to_avatar(user), :class => "avatar", :title => user.name ), user_path(user), :class => "avatar" %>
 															<% end %>
@@ -132,11 +132,11 @@
 											<table>
 												<tr>
 													<td style="padding-top: 5px">
-														<% if @bid.projects.size>0 %>
+														<% if @bid.projects.size>0%>
 															<% for project in @bid.projects%>														
 																<%= link_to image_tag(url_to_avatar(project), :class => "avatar", :title => project.name), project_path(project), :class => "avatar" %>															
 															<% end%>
-														<% else %>														
+														<%else%>
 															<p class="font_lighter"><%= l(:label_no_bid_project) %></p>
 														<% end %>
 														</td>
diff --git a/app/views/news/new.html.erb b/app/views/news/new.html.erb
index 05a0afa6a..42dbcae85 100644
--- a/app/views/news/new.html.erb
+++ b/app/views/news/new.html.erb
@@ -3,7 +3,7 @@
 <%= labelled_form_for @news, :url => project_news_index_path(@project),
                                            :html => { :id => 'news-form', :multipart => true } do |f| %>
   <%= render :partial => 'news/form', :locals => { :f => f } %>
-  <%= submit_tag l(:button_create) %>
+  <%= submit_tag l(:button_create), :class => "enterprise" %>
   <%= preview_link preview_news_path(:project_id => @project), 'news-form' %>
 <% end %>
 <div id="preview" class="wiki"></div>
diff --git a/app/views/projects/feedback.html.erb b/app/views/projects/feedback.html.erb
index ed6a961b6..118e714b0 100644
--- a/app/views/projects/feedback.html.erb
+++ b/app/views/projects/feedback.html.erb
@@ -12,7 +12,7 @@
 		</table>
 		<table border="0" width="525px" align="center">
 			<tr>
-				<td align="right"> <%= submit_tag l(:button_submit), :name => nil , :class => "bid_btn" %></td>
+				<td align="right"> <%= submit_tag l(:button_submit), :name => nil , :class => "enterprise" %></td>
 			</tr>
 		</table>
 		<% end %>
diff --git a/app/views/projects/new.html.erb b/app/views/projects/new.html.erb
index bd77865be..a58de5f6c 100644
--- a/app/views/projects/new.html.erb
+++ b/app/views/projects/new.html.erb
@@ -4,13 +4,13 @@
 		<h3><%=l(:label_course_new)%></h3>
 		<div class="box tabular">
     	<%= render :partial => 'course_form', :locals => { :f => f } %>
-    	<span style="padding-left: 60px"><%= submit_tag l(:button_create) %></span>
+    	<span style="padding-left: 60px"><%= submit_tag l(:button_create), :class => "enterprise"%></span>
 	    <!-- <%= submit_tag l(:button_create_and_continue), :name => 'course_continue' %> -->
     <% else %>
 		<h3><%=l(:label_project_new)%></h3>
 		<div class="box tabular" >
     	<%= render :partial => 'form', :locals => { :f => f } %>
-    	<span style="padding-left: 60px"><%= submit_tag l(:button_create)%></span>
+    	<span style="padding-left: 60px"><%= submit_tag l(:button_create), :class => "enterprise"%></span>
 	    <!-- <%= submit_tag l(:button_create_and_continue), :name => 'continue' %>	 -->
     <% end %>	
 	<%= javascript_tag "$('#project_name').focus();" %>	
diff --git a/app/views/projects/new_homework.html.erb b/app/views/projects/new_homework.html.erb
index 3737a6509..e1fd553b0 100644
--- a/app/views/projects/new_homework.html.erb
+++ b/app/views/projects/new_homework.html.erb
@@ -3,7 +3,7 @@
 <%= labelled_form_for @homework, :url => {:controller => 'bids', :action => 'create_homework'} do |f| %>
 <div class="box tabular">
 	<%= render :partial => 'homework_form', :locals => { :f => f } %>
-	<%= submit_tag l(:button_create) %>
+	<%= submit_tag l(:button_create), :class => "enterprise" %>
 	<%= javascript_tag "$('#bid_name').focus();" %>
 	<% end %>
 </div>
\ No newline at end of file
diff --git a/tmp/plugins/README b/tmp/plugins/README
new file mode 100644
index 000000000..edef25679
--- /dev/null
+++ b/tmp/plugins/README
@@ -0,0 +1 @@
+Put your Redmine plugins here.