improved
Merge remote-tracking branch 'origin/master'

Conflicts:
	custom-background/demo.html