another try with another foundation
Merge remote-tracking branch 'origin/master'

Conflicts:
	config.xml
	index.html
	play.html