Toolbar resized
Merge remote-tracking branch 'origin/master'

Conflicts:
	PetZombie/PetZombie.userprefs
Merge branch 'master' of https://github.com/PetZombie/PetZombie