small bugfix
Merge branch 'master' of https://github.com/courseportal/coursePortal
Added mathjax to question instances
Merge branch 'master' of https://github.com/courseportal/coursePortal

Conflicts:
	assignment/static/js/test.js
fancybox
merge,mathjax
Merge branch