Changed header to development
Changed header to staging
changed header to development
Merge branch 'develop' into staging

Conflicts:
	index.html