Merger certaines choses
Merge branch 'master' of https://github.com/ZuymantO/HotSpot

Conflicts:
	Advise.pyc
	Model.pyc