Fix formResourceTest.json
Attempt to get GCS working just through sheer luck
Merge branch 'version4' of github.com:bedatadriven/activityinfo into version4