update activity feed to update a task and recognize a completed task
work on task feed
Merge branch 'master' into tony

Conflicts:
	app/controllers/tasks_controller.rb
	app/views/activities/index.html.erb
	app/views/projects/show.html.erb