current solution
Merge branch 'master' of https://github.com/tangt07/The-Milk-Project

Conflicts:
	The Milk Project/Library/CurrentLayout.dwlt
	The Milk Project/Library/ScriptAssemblies/Assembly-CSharp.dll
	The Milk Project/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	The Milk Project/Library/assetDatabase3
	The Milk Project/Library/guidmapper
	The Milk Project/The Milk Project-csharp.sln
	The Milk Project/The Milk Project.sln