committed marino & hans
corretti conflitti
Merge https://github.com/nusco/elephant
testGrowsUp
manual merge changes from Hansjoerg and Marino
Merge branch 'master' of https://github.com/nusco/elephant