third update
.
Merge branch 'master' of https://github.com/freyyy/Varden

Conflicts:
	.gitignore
	DotSurvival/Assembly-CSharp-firstpass-vs.csproj
	DotSurvival/Assembly-CSharp-firstpass.csproj
	DotSurvival/Assembly-CSharp-vs.csproj
	DotSurvival/Assembly-CSharp.csproj
	DotSurvival/Assembly-UnityScript-firstpass-vs.unityproj
	DotSurvival/Assembly-UnityScript-firstpass.unityproj
	DotSurvival/Assembly-UnityScript-vs.unityproj
	DotSurvival/Assembly-UnityScript.unityproj
	DotSurvival/Assets/DotMove.cs
	DotSurvival/Assets/DotSurvival.unity
	DotSurvival/Assets/DotSurvivalStartScene.unity
	DotSurvival/Assets/Standard Assets (Mobile)/Control Setups/CameraRelativeSetup.unity
	DotSurvival/Assets/Standard Assets (Mobile)/Control Setups/FirstPersonSetup.unity
	DotSurvival/Assets/Standard Assets (Mobile)/Control Setups/FirstPersonTilt.unity
	DotSurvival/Assets/Standard Assets (Mobile)/Control Setups/PlayerRelativeSetup.unity
	DotSurvival/Assets/Standard Assets (Mobile)/Control Setups/SidescrollSetup.unity
	DotSurvival/Assets/Standard Assets (Mobile)/Control Setups/TapControlSetup.unity
	DotSurvival/Assets/Standard Assets (Mobile)/Materials/grid.mat
	DotSurvival/Assets/Standard Assets (Mobile)/Materials/gridFor2D.mat
	DotSurvival/Assets/Standard Assets (Mobile)/Materials/skybox.mat
	DotSurvival/Assets/Standard Assets (Mobile)/Prefabs/2D Side Scroller.prefab
	DotSurvival/Assets/Standard Assets (Mobile)/Prefabs/Camera Relative Controls.prefab
	DotSurvival/Assets/Standard Assets (Mobile)/Prefabs/Dual Joysticks.prefab
	DotSurvival/Assets/Standard Assets (Mobile)/Prefabs/Dual TouchPads.prefab
	DotSurvival/Assets/Standard Assets (Mobile)/Prefabs/First Person Controls.prefab
	DotSurvival/Assets/Standard Assets (Mobile)/Prefabs/First Person Tilt Controls.prefab
	DotSurvival/Assets/Standard Assets (Mobile)/Prefabs/Player Relative Controls.prefab
	DotSurvival/Assets/Standard Assets (Mobile)/Prefabs/Roll A Ball.prefab
	DotSurvival/Assets/Standard Assets (Mobile)/Prefabs/Single Joystick.prefab
	DotSurvival/Assets/Standard Assets (Mobile)/Prefabs/Single TouchPad.prefab
	DotSurvival/Assets/Standard Assets (Mobile)/Prefabs/TapToMove Controls.prefab
	DotSurvival/Assets/Standard Assets/Character Controllers/3rd Person Controller.prefab
	DotSurvival/Assets/Standard Assets/Character Controllers/First Person Controller.prefab
	DotSurvival/Assets/Standard Assets/Character Controllers/Sources/PrototypeCharacter/Materials/constructor_done.mat
	DotSurvival/Assets/Standard Assets/Light Flares/50mm Zoom.flare
	DotSurvival/Assets/Standard Assets/Light Flares/Small Flare.flare
	DotSurvival/Assets/Standard Assets/Light Flares/Sources/Materials/flare mat.mat
	DotSurvival/Assets/Standard Assets/Light Flares/Sun.flare
	DotSurvival/Assets/Standard Assets/Particles/Dust/Dust Storm.prefab
	DotSurvival/Assets/Standard Assets/Particles/Fire/Fire1.prefab
	DotSurvival/Assets/Standard Assets/Particles/Fire/Flame.prefab
	DotSurvival/Assets/Standard Assets/Particles/Legacy Particles/Small explosion.prefab
	DotSurvival/Assets/Standard Assets/Particles/Legacy Particles/Sparks.prefab
	DotSurvival/Assets/Standard Assets/Particles/Legacy Particles/explosion.prefab
	DotSurvival/Assets/Standard Assets/Particles/Legacy Particles/large flames.prefab
	DotSurvival/Assets/Standard Assets/Particles/Legacy Particles/small flames.prefab
	DotSurvival/Assets/Standard Assets/Particles/Misc/Fireworks.prefab
	DotSurvival/Assets/Standard Assets/Particles/Misc/Light Snow.prefab
	DotSurvival/Assets/Standard Assets/Particles/Misc/Soap Bubbles.prefab
	DotSurvival/Assets/Standard Assets/Particles/Misc/Sparks.prefab
	DotSurvival/Assets/Standard Assets/Particles/Smoke/Detailed Smoke.prefab
	DotSurvival/Assets/Standard Assets/Particles/Smoke/Fluffy Smoke Large.prefab
	DotSurvival/Assets/Standard Assets/Particles/Smoke/Fluffy Smoke.prefab
	DotSurvival/Assets/Standard Assets/Particles/Smoke/Smoke Trail.prefab
	DotSurvival/Assets/Standard Assets/Particles/Sources/Animations/Light explosion.anim
	DotSurvival/Assets/Standard Assets/Particles/Sources/Animations/Stop Emitting ,5 sec.anim
	DotSurvival/Assets/Standard Assets/Particles/Sources/Animations/Stop Emitting 1 sec.anim
	DotSurvival/Assets/Standard Assets/Particles/Sources/Animations/Stop Emitting 2 sec.anim
	DotSurvival/Assets/Standard Assets/Particles/Sources/Materials/Dust Material 1.mat
	DotSurvival/Assets/Standard Assets/Particles/Sources/Materials/Fairy Dust.mat
	DotSurvival/Assets/Standard Assets/Particles/Sources/Materials/Fire Add.mat
	DotSurvival/Assets/Standard Assets/Particles/Sources/Materials/Fire Smoke.mat
	DotSurvival/Assets/Standard Assets/Particles/Sources/Materials/FlameA.mat
	DotSurvival/Assets/Standard Assets/Particles/Sources/Materials/FlameB.mat
	DotSurvival/Assets/Standard Assets/Particles/Sources/Materials/FlameC.mat
	DotSurvival/Assets/Standard Assets/Particles/Sources/Materials/FlameD.mat
	DotSurvival/Assets/Standard Assets/Particles/Sources/Materials/FlameE.mat
	DotSurvival/Assets/Standard Assets/Particles/Sources/Materials/Poof1.mat
	DotSurvival/Assets/Standard Assets/Particles/Sources/Materials/Smoke Trail.mat
	DotSurvival/Assets/Standard Assets/Particles/Sources/Materials/Smoke.mat
	DotSurvival/Assets/Standard Assets/Particles/Sources/Materials/Smoke1.mat
	DotSurvival/Assets/Standard Assets/Particles/Sources/Materials/Smoke2.mat
	DotSurvival/Assets/Standard Assets/Particles/Sources/Materials/Smoke3.mat
	DotSurvival/Assets/Standard Assets/Particles/Sources/Materials/Smoke4.mat
	DotSurvival/Assets/Standard Assets/Particles/Sources/Materials/Snowflake.mat
	DotSurvival/Assets/Standard Assets/Particles/Sources/Materials/SoapBubble.mat
	DotSurvival/Assets/Standard Assets/Particles/Sources/Materials/Spark.mat
	DotSurvival/Assets/Standard Assets/Particles/Sources/Materials/Sparkles1.mat
	DotSurvival/Assets/Standard Assets/Particles/Sources/Materials/Sparkles2.mat
	DotSurvival/Assets/Standard Assets/Particles/Sources/Materials/Water Splash1.mat
	DotSurvival/Assets/Standard Assets/Particles/Sources/Materials/Water Splash2.mat
	DotSurvival/Assets/Standard Assets/Particles/Sparkles/Sparkle Rising.prefab
	DotSurvival/Assets/Standard Assets/Particles/Water/Water Fountain.prefab
	DotSurvival/Assets/Standard Assets/Particles/Water/Water Surface Splash.prefab
	DotSurvival/Assets/Standard Assets/Particles/Water/WaterFall.prefab
	DotSurvival/Assets/Standard Assets/Physic Materials/Bouncy.physicmaterial
	DotSurvival/Assets/Standard Assets/Physic Materials/Ice.physicmaterial
	DotSurvival/Assets/Standard Assets/Physic Materials/Metal.physicmaterial
	DotSurvival/Assets/Standard Assets/Physic Materials/Rubber.physicmaterial
	DotSurvival/Assets/Standard Assets/Physic Materials/Wood.physicmaterial
	DotSurvival/Assets/Standard Assets/Projectors/Blob Light Projector.prefab
	DotSurvival/Assets/Standard Assets/Projectors/Blob Shadow Projector.prefab
	DotSurvival/Assets/Standard Assets/Projectors/Grid Projector.prefab
	DotSurvival/Assets/Standard Assets/Projectors/Sources/Materials/Grid Material.mat
	DotSurvival/Assets/Standard Assets/Projectors/Sources/Materials/Light Material.mat
	DotSurvival/Assets/Standard Assets/Projectors/Sources/Materials/Shadow Material.mat
	DotSurvival/Assets/Standard Assets/Skyboxes/DawnDusk Skybox.mat
	DotSurvival/Assets/Standard Assets/Skyboxes/Eerie Skybox.mat
	DotSurvival/Assets/Standard Assets/Skyboxes/MoonShine Skybox.mat
	DotSurvival/Assets/Standard Assets/Skyboxes/Overcast1 Skybox.mat
	DotSurvival/Assets/Standard Assets/Skyboxes/Overcast2 Skybox.mat
	DotSurvival/Assets/Standard Assets/Skyboxes/StarryNight Skybox.mat
	DotSurvival/Assets/Standard Assets/Skyboxes/Sunny1 Skybox.mat
	DotSurvival/Assets/Standard Assets/Skyboxes/Sunny2 Skybox.mat
	DotSurvival/Assets/Standard Assets/Skyboxes/Sunny3 Skybox.mat
	DotSurvival/Assets/Standard Assets/Terrain Assets/Trees Ambient-Occlusion/Palm/Materials/palmbark.mat
	DotSurvival/Assets/Standard Assets/Terrain Assets/Trees Ambient-Occlusion/Palm/Materials/palmbranch.mat
	DotSurvival/Assets/Standard Assets/Tessellation Shaders/_Example/BumpedSpecular.mat
	DotSurvival/Assets/Standard Assets/Tessellation Shaders/_Example/BumpedSpecularDisplacement.mat
	DotSurvival/Assets/Standard Assets/Tessellation Shaders/_Example/BumpedSpecularSmooth.mat
	DotSurvival/Assets/Standard Assets/Tessellation Shaders/_Example/_TessellationScene.unity
	DotSurvival/Assets/Standard Assets/Toon Shading/Toony-Basic.mat
	DotSurvival/Assets/Standard Assets/Toon Shading/Toony-BasicOutline.mat
	DotSurvival/Assets/Standard Assets/Toon Shading/Toony-Lighted Outline.mat
	DotSurvival/Assets/Standard Assets/Toon Shading/Toony-Lighted.mat
	DotSurvival/Assets/Standard Assets/Toon Shading/_ToonShadingSample.unity
	DotSurvival/Assets/Standard Assets/Tree Creator/Sources/Materials/BigTree_bark.mat
	DotSurvival/Assets/Standard Assets/Tree Creator/Sources/Materials/BigTree_branches.mat
	DotSurvival/Assets/Standard Assets/Tree Creator/Sources/Materials/BigTree_leaves.mat
	DotSurvival/Assets/Standard Assets/Tree Creator/Trees/BigTree.prefab
	DotSurvival/Assets/Standard Assets/Water (Basic)/Daylight Simple Water.prefab
	DotSurvival/Assets/Standard Assets/Water (Basic)/Nighttime Simple Water.prefab
	DotSurvival/Assets/Standard Assets/Water (Basic)/Sources/Materials/Daylight Simple Water.mat
	DotSurvival/Assets/Standard Assets/Water (Basic)/Sources/Materials/Nighttime Simple Water.mat
	DotSurvival/Assets/Standard Assets/Water (Basic)/Sources/Objects/Materials/water plane-lambert1.mat
	DotSurvival/DotSurvival-csharp.sln
	DotSurvival/DotSurvival.sln
	DotSurvival/DotSurvival.userprefs
	DotSurvival/Library/CurrentLayout.dwlt
	DotSurvival/Library/InspectorExpandedItems.asset
	DotSurvival/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	DotSurvival/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	DotSurvival/Library/ScriptAssemblies/Assembly-CSharp.dll
	DotSurvival/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	DotSurvival/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	DotSurvival/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	DotSurvival/Library/ScriptAssemblies/Assembly-UnityScript.dll
	DotSurvival/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	DotSurvival/Library/assetDatabase3
	DotSurvival/Library/guidmapper
	DotSurvival/Library/metadata/26/26ebd1f47951f4434892c20bcd5e3861
	DotSurvival/Library/metadata/52/52b7d70b1de7c4ce09662b77c14d9fda
	DotSurvival/Library/metadata/53/5317f3e76581f4165b16ede5caa5f14b
	DotSurvival/Library/metadata/87/87a73ddc86ab3c14798e719c5c7f4ef9
	DotSurvival/Library/metadata/c5/c55afdc4a8a3b4890b07cc7d176510bb
	DotSurvival/ProjectSettings/AudioManager.asset
	DotSurvival/ProjectSettings/DynamicsManager.asset
	DotSurvival/ProjectSettings/EditorBuildSettings.asset
	DotSurvival/ProjectSettings/EditorSettings.asset
	DotSurvival/ProjectSettings/GraphicsSettings.asset
	DotSurvival/ProjectSettings/InputManager.asset
	DotSurvival/ProjectSettings/NavMeshLayers.asset
	DotSurvival/ProjectSettings/NetworkManager.asset
	DotSurvival/ProjectSettings/Physics2DSettings.asset
	DotSurvival/ProjectSettings/ProjectSettings.asset
	DotSurvival/ProjectSettings/QualitySettings.asset
	DotSurvival/ProjectSettings/TagManager.asset
	DotSurvival/ProjectSettings/TimeManager.asset