commit hotfix 02
Merge branch 'hotfix02'

Conflicts:
	Index.html