hotfix added
Merge branch 'staging'

Conflicts:
	index.html
Removed conflict solved text