Minor cleanup version in the render branch
Merge branch 'render'

Conflicts:
	index.html