playground updates
Merge branch 'master' into develop

Conflicts:
	examples/index.html