fix user_id to id in Survey model
Merge branch 'master' of https://github.com/danielleadams/blinky