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