hotfix222 fixed....
Merge branch 'hotfix2'

Conflicts:
	index.html
fixed by a k
k again
4th commit
after rebase...