added mathjax
fixing servside
Merge remote-tracking branch 'origin/master' into gh-pages

Conflicts:
	logger.php
	src/logger.js