none
none
Merge pull request #2 from hsandt/master

loader, state, sample...
petit truc
petit truc
fusion

Conflicts:
	engine/source/adventure/models.py
Merge pull request #5 from gustvgdt/master

modifications de models