Fix gradients syntax
Merge branch 'master' into iphone

Conflicts:
	style/theme/style.css