mise à jour
blabla
Merge branch 'dev' of https://github.com/gustvgdt/Point-and-Click into dev

Conflicts:
	engine/source/adventure/models.py
	engine/source/exception/__init__.py
	engine/source/exception/exception.py
	engine/source/helper/setter.py
	engine/source/state/adventurestate.py
	engine/source/state/game.py
	engine/source/view/layeredview.py
	sample/source/main.py
	source/helper/load.py
qdghfd
Merge branch 'dev' of https://github.com/gustvgdt/Point-and-Click into dev

Conflicts:
	engine/source/adventure/models.py
	engine/source/exception/__init__.py
	engine/source/exception/exception.py
	engine/source/helper/setter.py
	engine/source/state/adventurestate.py
	engine/source/state/game.py
	engine/source/view/layeredview.py
	sample/source/main.py
	source/helper/load.py