Changé params generation
Merge branch 'master' of github.com:Eijebong/Capoue

Conflicts:
	entity.py