small additions to server
Merge branch 'master' of https://github.com/skatinsam/ICS168-Swarch-

Conflicts:
	SwarchServer/SwarchServer.v11.suo
Merge branch 'master' of https://github.com/skatinsam/ICS168-Swarch-

Conflicts:
	Library/CurrentLayout.dwlt
	SwarchServer/SwarchServer/Server.cs
Nothing of note
Merge branch 'master' of https://github.com/skatinsam/ICS168-Swarch-

Conflicts:
	Assets/Login.unity
	Library/CurrentLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	SwarchServer/SwarchServer.v11.suo
	SwarchServer/SwarchServer/DatabaseManager.cs
	SwarchServer/SwarchServer/bin/Debug/SwarchServer.exe
	SwarchServer/SwarchServer/bin/Debug/SwarchServer.pdb