Conflict 1
Conflict 2
Merge branch 'hotfix' into staging

Conflicts:
	index.html
This works
Merge branch 'dev' into staging
Merge branch 'staging'