General Help; [img] tag for MathContent
Merge branch 'dev_branch'

Conflicts:
	base/templates/help/help_general.html
	base/views.py
	mathcontent/utils.py
Merge branch 'dev_branch'
Merge branch 'dev_branch'
Merge branch 'dev_branch'
Merge branch 'dev_branch'
Merge branch 'dev_branch'
Merge branch 'dev_branch'
Merge branch 'dev_branch'
Merge branch 'dev_branch'
Merge branch 'dev_branch'
Merge branch 'dev_branch'
Merge branch 'dev_branch'
Merge branch 'dev_branch'
Merge branch 'dev_branch'
Merge branch 'dev_branch'
Merge branch 'dev_branch'
Merge branch 'dev_branch'
Merge branch 'dev_branch'
Merge branch 'dev_branch'