New ice texture
Merge remote-tracking branch 'kotzi/master'

Conflicts:
	assets/ice.png