Merge pull request #381 from stefanbeller/master

Fix #380 and rename a parameter.
Revert "Merge pull request #378 from stefanbeller/master"

This reverts commit 5d1d4d657440984e260b7acb0d92a9f86fe478d3, reversing
changes made to 0f69b31ed167cc98c7f0d10c22de6202b262fb48.

So I run
  git revert --mainline 1 5d1d4d657440984e260b7acb0d92a9f86fe478d3
to purge all the changes I started on the StatBlock reorganisation.
I tested specially the transforming of the Avatar and it seems to work
again nicely.

Conflicts:
	src/Avatar.cpp
	src/GameStatePlay.cpp
	src/NPC.cpp
Merge pull request #382 from stefanbeller/revert

Revert "Merge pull request #378 from stefanbeller/master"
Revert "Revert "Merge pull request #378 from stefanbeller/master""

This reverts commit 4c4aacac3feffb2b64a15f6821a3ca9461c40db4.