Fixes #115 and #95
Merge branch 'master' of github.com:ucam-cl-dtg/urop-2013-questions
Merge branch 'master' of github.com:ucam-cl-dtg/urop-2013-questions
import cleanup
Removed docs, added by mistake
Merge branch 'master' of github.com:ucam-cl-dtg/urop-2013-questions

Conflicts:
	src/main/webapp/templates/questions/view/question/tab/overview.js.soy
	src/main/webapp/templates/questions/view/set/full.js.soy
Merge branch 'master' of github.com:ucam-cl-dtg/urop-2013-questions

Conflicts:
	src/main/webapp/css/questions.css