nico 30/08/2013 09:22
Merge branch 'master' of https://github.com/nicolasvonjy/Handicaps

Conflicts:
	Handicaps.Tests/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Handicaps.v11.suo
	Handicaps/Handicaps.csproj
	Handicaps/Models/EntityHandicaps.Designer.cs
	Handicaps/Models/EntityHandicaps.edmx
	Handicaps/Web.config
	Handicaps/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Handicaps/obj/Debug/TempPE/Models.EntityHandicaps.Designer.cs.dll