Uncommented
Merge branch 'master' of github.com:gerdkortemeyer/loncapa

Conflicts:
	test/math_parser_test_cases.pl