Refactored in order to facilitate tests. Added tests.
Merge branch 'ServerDev' of github.com:MaartenvE/game1 into ServerDev

Conflicts:
	Server/Assembly-CSharp-vs.csproj
	Server/Assembly-CSharp.csproj
	Server/Assets/Scripts/PrefabInstantiate.cs
	Server/Assets/Scripts/Server.cs
	Server/Assets/Server.unity
	Server/Server-csharp.sln
	Server/Server.sln
	Server/Server.userprefs