fix survey contest, eliminate usage of current_qn
Merge branch 'development' of github.com:Coursemology/coursemology.org into Deploy