_
Merge commit 'aa6bca537f321b63e4b7dc9ae82767153439006e'
_
Merge commit '320085ad458d63e21e2f605347230f82bf40fa02'

Conflicts:
	src/com/h4201/prototype/controleur/Controleur.java
Merge branch 'master' of https://github.com/H4201/DevOO.git
+
Merge branch 'master' of https://github.com/H4201/DevOO.git