Merge remote-tracking branch 'remotes/origin/projects_search' into fixes

# Conflicts:
#	app/views/favorites/projects.html.erb
#	db/schema.rb

app/views/favorites/projects.html.erb

@@ -1,11 +1,34 @@
-<%= render(:partial => "nav")%>
+<%= render(:partial => "nav") %>
 
 <h1>Favorite Projects</h1>
 
-<p>Not implemented yet!</p>
-
-<%# if !@favorite_theses[0].blank? %>
-
-<%# else %>
-<!--  No favorite projects added yet!-->
-<%# end %>
+<% if !@favorite_projects[0].blank? %>
+  <div class="table_wrapper">
+    <table>
+      <tr>
+        <th><%= sortable "Title", "title" %></th>
+        <th><%= sortable "Registration Date", "created_at" %></th>
+        <th></th>
+        <th></th>
+      </tr>
+      <% for project in @favorite_projects %>
+        <tr>
+          <td>
+            <%= project['title'] %>
+          </td>
+          <td>
+            <%= project['created_at'] %>
+          </td>
+          <td>
+            <%= button_to 'Details', crawlers_projects_crawler_show_detail_url(:id => project['id']) %>
+          </td>
+          <td>
+            <%= button_to 'Delete', {:action => "delete_project", :id => project['id']}, :method => 'delete' %>
+          </td>
+        </tr>
+      <% end %>
+    </table>
+  </div>
+<% else %>
+  No favorite projects added yet!
+<% end %>