- new version of beta
Merge branch 'beta'

Conflicts:
	index.html