Alla Allexs grejer :D
Merge branch 'master' of https://github.com/leejesslee/RAV_SOMMAR2014

Conflicts:
	Assets/0 Animations.meta
	Assets/4 Texturer/Materials/tex_bridge2.mat
	Assets/4 Texturer/Materials/tex_bridge2.mat.meta
	Assets/Editor.meta
	Assets/Fonts.meta
	Assets/Materials/tex_bridge.mat
	Assets/Materials/tex_bridge.mat.meta
	Assets/Materials/tex_bridge2.mat
	Assets/Materials/tex_bridge2.mat.meta
	Assets/PlayMaker/Actions/Editor.meta
	ProjectSettings/ProjectSettings.asset
	ProjectSettings/QualitySettings.asset
Allex 31/7 10:49
Merge branch 'master' into design

Conflicts:
	Assets/0 Animations/Boy/Clothes/Materials.meta
	Assets/4 Texturer/Materials/dirt_UV_DIF.mat
	Assets/4 Texturer/Materials/dirt_UV_DIF.mat.meta
	Assets/4 Texturer/Materials/dirt_UV_DIF_OCC.mat
	Assets/4 Texturer/Materials/dirt_UV_DIF_OCC.mat.meta
	Assets/4 Texturer/Materials/dirt_UV_DIF_SPEC.mat
	Assets/4 Texturer/Materials/dirt_UV_DIF_SPEC.mat.meta
	Assets/4 Texturer/Materials/tex_mod3_del7.mat
	Assets/4 Texturer/Materials/tex_mod3_del7.mat.meta
	Assets/4 Texturer/Texture.meta
	Assets/4 Texturer/Texture/dirt_UV_DIF.png
	Assets/4 Texturer/Texture/dirt_UV_DIF.png.meta
	Assets/4 Texturer/Texture/dirt_UV_DIF_OCC.png
	Assets/4 Texturer/Texture/dirt_UV_DIF_OCC.png.meta
	Assets/4 Texturer/Texture/dirt_UV_DIF_SPEC.png
	Assets/4 Texturer/Texture/dirt_UV_DIF_SPEC.png.meta
	Assets/4 Texturer/Texture/sand_DIF(1).png
	Assets/4 Texturer/Texture/sand_DIF(1).png.meta
	Assets/Materials/Tex_Diff_Skydome_blueversion.mat
	Assets/Materials/Tex_Diff_Skydome_blueversion.mat.meta
	Assets/Materials/tex_bridge.mat.meta
	Assets/Materials/tex_mod3_del7.mat
	Assets/Materials/tex_mod3_del7.mat.meta
	Assets/Meshes/Environment.meta
	Assets/Prefabs Blockout/RockBlobs/Materials.meta
	Assets/Standard Assets.meta
	Assets/Texture.meta
	Assets/Texture/Materials.meta
	Assets/Texture/Materials/dirt_UV_DIF.mat
	Assets/Texture/Materials/dirt_UV_DIF.mat.meta
	Assets/Texture/Materials/dirt_UV_DIF_OCC.mat
	Assets/Texture/Materials/dirt_UV_DIF_OCC.mat.meta
	Assets/Texture/Materials/dirt_UV_DIF_SPEC.mat
	Assets/Texture/Materials/dirt_UV_DIF_SPEC.mat.meta
	Assets/Texture/dirt_UV_DIF.png
	Assets/Texture/dirt_UV_DIF.png.meta
	Assets/Texture/dirt_UV_DIF_OCC.png
	Assets/Texture/dirt_UV_DIF_OCC.png.meta
	Assets/Texture/dirt_UV_DIF_SPEC.png
	Assets/Texture/dirt_UV_DIF_SPEC.png.meta
	Assets/Texture/sand_DIF(1).png.meta
	Assets/Textures/Environment/Materials/dirt_UV_DIF.mat
	Assets/Textures/Environment/Materials/dirt_UV_DIF.mat.meta
	Assets/Textures/Environment/Materials/dirt_UV_DIF_OCC.mat
	Assets/Textures/Environment/Materials/dirt_UV_DIF_OCC.mat.meta
	Assets/Textures/Environment/Materials/dirt_UV_DIF_SPEC.mat
	Assets/Textures/Environment/Materials/dirt_UV_DIF_SPEC.mat.meta
	Assets/Textures/Environment/Rock-Texture-Surface.jpg.meta
	Assets/Textures/Environment/dirt_UV_DIF.png
	Assets/Textures/Environment/dirt_UV_DIF.png.meta
	Assets/Textures/Environment/dirt_UV_DIF_OCC.png
	Assets/Textures/Environment/dirt_UV_DIF_OCC.png.meta
	Assets/Textures/Environment/dirt_UV_DIF_SPEC.png
	Assets/Textures/Environment/dirt_UV_DIF_SPEC.png.meta
	Assets/Textures/Exterior/temp_WoodPlanks.jpg.meta