*For Basti
Merge branch 'master' into reavel-dev

Conflicts:
	Unity/Assets/Scenes/MainScene.unity
	Unity/Assets/Terrain Assets/Trees Ambient-Occlusion/Materials/alder-alderbark.mat
	Unity/Assets/Terrain Assets/Trees Ambient-Occlusion/Materials/alderbranches.mat
	Unity/Library/CurrentLayout.dwlt
	Unity/Library/ScriptAssemblies/Assembly-UnityScript.dll
	Unity/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Unity/Library/assetDatabase3
	Unity/Library/expandedItems