Big time updates
Fixed merge conflicts
Merge pull request #16 from inoda/listing-surveys

Listing surveys