Suppression du fichier ErrorTemp.txt
Ajout message erreur alert categorie
Merge branch 'fred' of github.com:Denis1507/Sentinelles into fred

Conflicts:
	SiteSentinellesHY/Formulaires/FRMForum.aspx
Merge branch 'fred' of github.com:Denis1507/Sentinelles into fred
Merge branch 'fred' of github.com:Denis1507/Sentinelles into fred
Petite correction message d'erreur
Petite correction message d'erreur(publication)
Page Createurs, ajout logo cegep, elements statique du site
Liste Impeccable 2014-02-28-13:54
Merge branch 'js' of github.com:Denis1507/Sentinelles into js

Conflicts:
	SiteSentinellesHY/Formulaires/FRMPanneauDeControle.aspx
Merge branch 'mic' of https://github.com/Denis1507/Sentinelles.git
merge conflicts
Merge branch 'js'
merge
commit assez suspect, a revoir
merge assez suspect 2