Get automatically survey_id in TakingsController
Merge remote-tracking branch 'origin/nrvnTesting' into dev