Changement du model
Merge remote-tracking branch 'origin/master'

Conflicts:
	LuccaRPG/LuccaRPG.suo
	LuccaRPG/LuccaRPG/LuccaRPG.csproj
	LuccaRPG/LuccaRPG/Models/Hero.cs
	LuccaRPG/LuccaRPG/Scripts/jquery.validate-vsdoc.js
	LuccaRPG/LuccaRPG/Scripts/jquery.validate.js
	LuccaRPG/LuccaRPG/Scripts/jquery.validate.min.js
	LuccaRPG/LuccaRPG/bin/LuccaRPG.dll
	LuccaRPG/LuccaRPG/bin/LuccaRPG.pdb
	LuccaRPG/LuccaRPG/obj/Debug/DesignTimeResolveAssemblyReferences.cache
	LuccaRPG/LuccaRPG/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	LuccaRPG/LuccaRPG/obj/Debug/LuccaRPG.dll
	LuccaRPG/LuccaRPG/obj/Debug/LuccaRPG.pdb
Merge