new contenu
bug fixed partie enchères et offres
Merge branch 'Integration_beta3'

Conflicts:
	.idea/modules.xml
	.idea/workspace.xml
	bdd/bd_pi2.sql
	controleurs/ControleurAdmin.class.php
	modeles/Enchere.class.php
	modeles/Offre.class.php
	site/css/enchere.css
	site/css/main.css
	site/js/enchere.js
	vues/VueEnchere.class.php