nettoyage
Merge branch 'master' of https://github.com/Chocobozzz/pup-framework

Conflicts:
	local/bin/wargame/src/wargame/IConfig.java
	local/bin/wargame/src/wargame/Infobulle.java
Merge branch 'master' of https://github.com/Chocobozzz/pup-framework