Merge branch 'tutorialdev'

Conflicts:
	MathStacks.css