add back options for survey answer
Merge branch 'development' of github.com:Coursemology/coursemology.org into dev/voting