Merge pull request #4 from hsandt/master

Màj
Merge pull request #5 from hsandt/master

mise à jour
Merge pull request #6 from hsandt/master

mise à jour
mise à jour
blabla
cgt de path
...
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
Merge pull request #8 from gustvgdt/master

maj
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
dfgh
dfghj
suppression source
init de source
Merge pull request #7 from gustvgdt/master

Résolution des conflits?