new branch
developed in develop
Merge branch 'staging' into develop

Conflicts:
	index.html