maj (correction de bugs)
resolution de conflit
resolution conflit
Merge branch 'master' of https://github.com/bloodmaker/PFS2014-G3

Conflicts:
	bin/gui/GUIManager.class
	bin/gui/GestionChoix.class
	bin/gui/Test.class
	bin/model/bdd/GestionnaireStock.class
	src/gui/GUIManager.java
	src/gui/GestionChoix.java
	src/gui/Test.java
	src/model/bdd/GestionnaireStock.java
update conflit