grant resources
Merge branch 'master' of github.com:spanner/cdb_client

Conflicts:
	app/models/grant.rb
	app/models/grant_type.rb
end date only applies if completion mark present