First ice level
Merge remote-tracking branch 'kotzi/master'

Conflicts:
	data/level2.tmx