htfry
Merge branch 'master' of https://github.com/vadimptr/Unity3D

Conflicts:
	LevelEditor/Assets/LevelEditorScene.unity
	LevelEditor/Assets/Scripts/Editor/LevelDesignerEditor.cs
	LevelEditor/LevelEditor.userprefs
	LevelEditor/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	LevelEditor/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	LevelEditor/Library/ScriptAssemblies/Assembly-CSharp.dll
	LevelEditor/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	LevelEditor/Library/assetDatabase3
	LevelEditor/Library/metadata/18/18d5dcf5a8c4b334a83913151190a349
	LevelEditor/Library/metadata/d0/d09bad6e1ab396643b8b2504fd45209d
	Tanks/Library/assetDatabase3