Merge branch 'master' of https://github.com/Obliman/RTS_Source

Conflicts:
	RTS/Assets/Scenes/Main.unity
	RTS/Assets/Scripts/BlockScript.cs
	RTS/Library/CurrentLayout.dwlt
	RTS/Library/ScriptAssemblies/Assembly-CSharp.dll
	RTS/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	RTS/Library/assetDatabase3
	RTS/Library/metadata/db/dbdf04dffe790fd4080785e188ce96ad
	RTS/ProjectSettings/TagManager.asset
	RTS/RTS-csharp.sln
	RTS/RTS.sln
	RTS/RTS.userprefs

Revert "11/11/14"

This reverts commit
5d59b9184f7b9b31f35097ac11e4a16e86138050.
Merge branch 'master' of https://github.com/Obliman/RTS_Source