Updated readme text
update on branch bug79
updated test.html in hotfix branch
Merge branch 'bug79'

Conflicts:
	test.html