Updated with map builder
Merge branch 'feature/grid' of git://github.com/jonathangs/Yoonicorn into jonathangs-feature/grid

Conflicts:
	LiberationDay/LiberationDay-csharp.sln
	LiberationDay/LiberationDay.sln
	LiberationDay/LiberationDay.userprefs
	LiberationDay/Library/CurrentLayout.dwlt
	LiberationDay/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	LiberationDay/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	LiberationDay/Library/ScriptAssemblies/Assembly-CSharp.dll
	LiberationDay/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	LiberationDay/Library/assetDatabase3
	LiberationDay/Library/expandedItems
added txt change
Merge branch 'jonathangs-feature/grid'