fixed a bug
Merge branch 'master' into adam_grant

Conflicts:
	app/models/grant.rb
	app/views/tasks/new.html.erb