Customer and Generic survey controllers
Merge branch 'Fixes' into beta_build