MAJ CRUDs Promotions, Tarifs, Articles
CRUD TVA
Validation des champs obligatoires pour un nouvel Article
Merge branch 'master' of https://github.com/ArthurBargy/eboucherie.git

Conflicts:
	WebContent/articles.jsp
	WebContent/js/promotions.js
	WebContent/promotions.jsp
	WebContent/tarifs.jsp
	src/com/boucheriebenz/eboucherie/controller/TarifController.java
	src/com/boucheriebenz/eboucherie/model/Article.java
	src/com/boucheriebenz/eboucherie/model/TVA.java
	src/com/boucheriebenz/eboucherie/model/Tarif.java
	src/com/boucheriebenz/eboucherie/service/ArticleService.java
	src/com/boucheriebenz/eboucherie/service/PromotionService.java
	src/com/boucheriebenz/eboucherie/service/TVAService.java
	src/com/boucheriebenz/eboucherie/service/TarifService.java
	src/db.properties