Survey Gridv2 first commit
remove old s3 support
Merge pull request #499 from virtualrobotix/for_merge

For merge