Crafters and Materials
Whitewash init + MaterialsProperties
Materials set. Need to test
Merge remote-tracking branch 'origin/Emilie' into Stéphane

Conflicts:
	Gleipnir.sln
Begin MaterialsTest
Building init
Merge remote-tracking branch 'origin/Emilie' into Stéphane
JobsBuildings implemented
Merge remote-tracking branch 'origin/Emilie' into Stéphane
Merge remote-tracking branch 'origin/develop' into Antoine
Base of test scenario for different Buildings
Merge remote-tracking branch 'origin/develop' into Stéphane

Conflicts:
	GameJobs/GameJobs.csproj
	Gleipnir.sln
	Gleipnir.sln.orig
	Tests/Tests.csproj
	Updates/Updates.csproj
Family tests.
Modify GamePage & add InfoBox UserControls
a dash of happiness tests
save commit
Merge remote-tracking branch 'origin/Emilie' into Village
Add Village object
Merge remote-tracking branch 'origin/Emilie' into Antoine
Merge remote-tracking branch 'origin/Village' into Stéphane

Conflicts:
	Gleipnir.sln