pgrades filling in
Merge remote-tracking branch 'origin/develop' into Finalize-Upgrades

Conflicts:
	Gleipnir/TabIndex.Designer.cs
Button in scenario added + informations in villager list tabIndex
Merge remote-tracking branch 'origin/Finalize-Upgrades' into develop