Conflict 1
Merge branch 'hotfix' into staging

Conflicts:
	index.html