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

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

app/controllers/favorites_controller.rb

@@ -35,7 +35,14 @@ class FavoritesController < ApplicationController
   end
 
   def projects
+    @favorite_projects = FavoriteProject.where('user_id': current_user.id)
+                             .order(sort_column + " " + sort_direction)
+    @host = 'https://tiss.tuwien.ac.at'
+  end
 
+  def delete_project
+    FavoriteProject.find_by(id: params[:id]).destroy
+    redirect_back(fallback_location: projects)
   end
 
   private