Fixed staging bugs in develop branch.
Merge branch 'staging'

Conflicts:
	index.html
new index.html