update
Merge branch 'master' of https://github.com/joester/ICS168Swarch

Conflicts:
	Swarch/Assets/LoginScreen.unity
	Swarch/Library/CurrentLayout.dwlt
	Swarch/Library/assetDatabase3
	Swarch/Library/guidmapper
	Swarch/Swarch-csharp.sln
	Swarch/Swarch.sln
	Swarch/Swarch.userprefs