Random changes that unity did to files.
Test commit.
Merge remote-tracking branch 'upstream/master' into mapwork

Conflicts:
	Unity/Assets/World/SpawnVillage/Map.json
	Unity/Unity-csharp.sln
	Unity/Unity.sln
	Unity/Unity.userprefs
Merge pull request #5 from Pyriana/mapwork

Mapwork