Added developing title
Added developing branch
Merge branch 'develop' into staging

Conflicts:
	index.html
Fix some stuff