Merge branch 'beta1.0'

Conflicts:
	i/index.html