Fixing bugs
More bugs
Merge branch 'master' into heather

Conflicts:
	app/controllers/comments_controller.rb
	app/controllers/projects_controller.rb
	app/controllers/tasks_controller.rb
	app/views/public_activity/comment/_update.html.erb
	app/views/public_activity/project/_update.html.erb
	app/views/public_activity/task/_create.html.erb
	app/views/public_activity/task/_update.html.erb
Derp
Renamed partial
Renamed partial.
Sortable everything!
Minor refactoring
Refactoring
Refactoring
Refactoring