Added agency_id field to survey. Ticket #210
Merge branch 'ticket-211' into staging