Promotion globale
Modification Product
Merge branch 'Mdm' of https://github.com/iNowa/MIWA2014.git into Mdm
Parse flux delta
Modification parsing flux delta
Merge branch 'Mdm' of https://github.com/iNowa/MIWA2014 into Mdm

Conflicts:
	Mdm/src/fr/epita/sigl/miwa/application/Product.java
	Mdm/src/fr/epita/sigl/miwa/application/Promotion.java
Update Promotion.java