Version Finale deployee avec WebDeploy et Visual Studio 2013
Merge branch 'master' into Default

Conflicts:
	GestionIncidents/CSS/Default.css
	GestionIncidents/CSS/GestionAdminGroup.css
	GestionIncidents/CSS/GestionTickets.css
	GestionIncidents/GestionAdminGroup.aspx
	GestionIncidents/GestionAdminGroup.aspx.cs
	GestionIncidents/Managers/DatabaseManager.cs
	GestionIncidents/Managers/SendMail.cs
	GestionIncidents/Web.config
	GestionIncidents/bin/GestionIncidents.dll
	GestionIncidents/bin/GestionIncidents.pdb
	GestionIncidents/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	GestionIncidents/obj/Debug/GestionIncidents.dll
	GestionIncidents/obj/Debug/GestionIncidents.pdb
Resolution des conflits