add etage 1 plan2D and preview
Merge branch 'master' of https://github.com/lightquartz/PFE_Nicolas_Matthieu

Conflicts:
	3DCam_Unity/3DCam_Unity-csharp.sln
	3DCam_Unity/3DCam_Unity.sln
	3DCam_Unity/Assembly-CSharp-vs.csproj
	3DCam_Unity/Assembly-CSharp.csproj
	3DCam_Unity/Library/CurrentLayout.dwlt
	3DCam_Unity/Library/ScriptAssemblies/Assembly-CSharp.dll
	3DCam_Unity/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	3DCam_Unity/Library/assetDatabase3
	3DCam_Unity/Library/expandedItems
	3DCam_Unity/Library/guidmapper
	3DCam_Unity/Library/metadata/2d/2d01f7b13ce16e9428973fac67cb5f90