fixing name conflicts between JS & soy templates
fixes #99
Merge branch 'master' of git@github.com:ucam-cl-dtg/urop-2013-questions.git