changing text for JSD
Merge branch 'master' into ap89

Conflicts:
	www/index.html