Merge branch 'index'

Conflicts:
	client/index/index.html