k
ajax
Merge branch 'master' of https://github.com/jord14k/ways

Conflicts:
	Web.config
	bin/ways.dll
	bin/ways.pdb
	obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	obj/Debug/ways.dll
	obj/Debug/ways.pdb
	ways.csproj
	ways.suo
quizz
Merge branch 'master' of https://github.com/jord14k/ways

Conflicts:
	couche_middleware/couche_metier/couche_controleur_workflow/WF_utilisateur.cs
	ways.suo
all