test again on iss54
test again on hotfix
add comment.
Merge branch 'iss54'

Conflicts:
	index.html