fixing null text
Merge branch 'master' into htrc

Conflicts:
	www/index.html