Merge pull request #16 from Rayvexx/master

Mise à jour Classes
temp
mise à jour
Merge branch 'master' into Florian
version 20140118
Merge branch 'master' of https://github.com/Rayvexx/Projet_annuel into Adrien
Finalisation de la classe Visite
Merge remote-tracking branch 'origin/master' into Adrien

Conflicts:
	modele/evenement_class.php
Categories
Merge branch 'Florian' of https://github.com/Rayvexx/Projet_annuel into Adrien

Conflicts:
	controller/news.php
	index.php
	modele/visite_class.php
gestion catégories
Categories
Merge pull request #32 from Rayvexx/Adrien

Adrien