fix bug
Merge branch 'staging'

Conflicts:
	index.html