a partial update - new fields, rm search, etc
add grants services display and resource
Merge branch '7.x-1.x' of https://github.com/detroitledger/gnl_schema into 7.x-1.x

Conflicts:
	gnl_schema.services.inc
	gnl_schema.strongarm.inc
	gnl_schema.views_default.inc