Fix fill in blanks and calculated question square brackets - refs BT#9037
Add Mathjax to CKEditor - refs BT#8972
Replace mathjax icon with mimetex icon - refs BT#8972
Solve conflict - refs BT#8968 refs BT#8972
Solve conflict - refs BT#8968 refs BT#8972