Edited  path to mathjax
Merge remote-tracking branch 'origin/master'

Conflicts:
	educomplex-web/src/main/webapp/resources/ckeditor/config.js
Edited  path to mathjax