Level 2 ok + modele level 3
Merge branch 'master' of github.com:NicoSab/Oilin

Conflicts:
	Oilin/Oilin.userprefs