Modification cinematique, menu, son
Merge branch 'master' of https://github.com/EPSIProjetWatchIT/Watchit

Conflicts:
	Assets/Scripts/Personnage/Grotte/Mouvement.cs
	Library/CurrentLayout.dwlt
	Library/CurrentMaximizeLayout.dwlt
	Library/EditorUserBuildSettings.asset
	Library/InspectorExpandedItems.asset
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript.dll
	Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/0d/0d9e4e57d0978a647bd97988a5d3994e
	Library/metadata/13/13cfdd77dd4c1634c95b73211be8f1fe
	Library/metadata/20/2019ee91c6c25d54da00e3d93fba0cc6
	Library/metadata/20/202f65ac81f3aa245a1a290d549d4a5b
	Library/metadata/28/28ef6e2d9644a1240a988d74b42d86bf
	Library/metadata/2b/2b7fbbf16b0ddff41ab9b03b5f60a7d6
	Library/metadata/31/3134ff50048aacc49ae105a23ef3b4d6
	Library/metadata/48/48db2b8fc426879428627fe1f11b449a
	Library/metadata/49/495f6eb8be10d7442bde94ee06b6b138
	Library/metadata/5f/5f02dd169444d4b4bb641801f416eebc
	Library/metadata/64/64bbd188967c2bf4a8db5c9b39fcc784
	Library/metadata/67/67c155c08d2087f48bc84070e25da137
	Library/metadata/69/69197d347b0af3d418fa323de7625105
	Library/metadata/71/719298babe64bc34cac736d2a0b9c0fd
	Library/metadata/75/75925d2c539c2c34f81f56b238bcaf1b
	Library/metadata/8f/8f0aa2397b67c0348a546fa5139ec16d
	Library/metadata/99/998d731ad96cb8541860e0cd04215cb0
	Library/metadata/a9/a9a18e8c5da9c71468368e0147bffd87
	Library/metadata/c2/c28dde3149f105842a035c5240fd1441
	Library/metadata/c3/c366e8bc49bb63d4386e5fbd09e5ca3d
	Library/metadata/c7/c754fbca235ec0c4da3d863f8e086bc4
	Library/metadata/d3/d385876178988c84a9b87bd50ed83640
	Library/metadata/d3/d3cf46a2157a3cf47bb8b2dec38c5437
	Library/metadata/db/db17fa7691fbd7b488c92bbdb6a13997
	Library/metadata/dd/dd7612de1df3cf845a66740b95b08b1d
	Library/metadata/e6/e6254020218e1de47a079a9205b81434
	Library/metadata/ec/ec1de1260a6372242bdcdcd24f7f6d5e
	Library/metadata/ee/ee768b292f35abc409f7a5b75d3830af
	WatchIt.userprefs