Merge branch 'master' into jingxian2
Merge branch 'master' into jingxian2
Parametric function example
Parametric function example 2

Changed the x,y axis positions to the center.
Merge branch 'master' into jingxian2
"Save As…" button text and title changed
Merge branch 'master' into jingxian2
Question mark and explanation for Root and Share

The question mark and meaning to Root and Share checkbox have been
added.
Question mark and explanation for Root and Share

Marked the first question mark with Root. May need variables for
description strings.
Question mark for URL

Added question mark and description to URL in author mode.
Merge branch 'master' into jingxian2

Conflicts:
www/index.html
Merge master into jingxian2
Merge branch 'master' into jingxian2
Update jingxian2
Merge branch 'master' into jingxian2
Merge branch 'master' into jingxian2
Merge branch 'master' into jingxian2

Conflicts:
	www/math-parser
Merge branch 'jingxian2' of http://github.com/bvds/LaitsV3 into jingxian2
Merge branch 'master' into jingxian2
Fixing bug 2466 - bus fleet public