Add grant tracking features to allocations
Fixes for handling differences between file and dir ops
Merge branch '07092013_allocations' into 07092013_api_key_auth

Conflicts:
	init.rb
	lib/cwabrowserhelper.sh