Update and add scenario's for testing interaction with new deferred container on context page and fix regressions

app/controllers/contexts_controller.rb

@@ -286,7 +286,7 @@ class ContextsController < ApplicationController
         
       @projects = current_user.projects
 
-      @count = @not_done_todos.size
+      @count = @not_done_todos.count + @deferred.count + @pending.count
     end
 
   end

app/controllers/todos_controller.rb

@@ -1371,6 +1371,7 @@ class TodosController < ApplicationController
     @original_item_due = @todo.due
     @original_item_due_id = get_due_id_for_calendar(@todo.due)
     @original_item_predecessor_list = @todo.predecessors.map{|t| t.specification}.join(', ')
+    @todo_was_deferred_or_blocked = @todo.deferred? || @todo.pending?
   end
 
   def update_project