recuperation
Merge branch 'master' of https://github.com/BabacarPlusPlus/TER-2014

Conflicts:
	Assets/Particules.meta
	Library/CurrentLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	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/ScriptMapper
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/05/054c19cd9824a4257a98a59874c988f3
	Library/metadata/05/05951b824895f3848be1bde07fb8791a
	Library/metadata/08/0851d20900b94ca408d217c8f3c91c6c
	Library/metadata/0a/0ab79d7f243824f5d9826bd83522c8df
	Library/metadata/0b/0b167d00b3108411a8a963cba5ddde1b
	Library/metadata/12/1201cd25d9690a24496aa6d08cca1e85
	Library/metadata/1a/1a1593da9974aae438739fb8ff4883fc
	Library/metadata/1d/1d5ac211a643e447ca78c2d794a16381
	Library/metadata/20/20469f851e66973438494eeca79c22b1
	Library/metadata/23/2314ce3a3eecf4816bad3c9eca4de2e1
	Library/metadata/2c/2c19560e3c6a341e48361ef8c42b3609
	Library/metadata/30/30001a371dba7d340814d3e8decc5fc8
	Library/metadata/30/3069907128af34efca9780c9aea75eb0
	Library/metadata/36/365dd2da98dd9431b8c5d7406c200eeb
	Library/metadata/39/39a17c8ca04cfa644ba4c2054365bb50
	Library/metadata/3f/3f054d86a6d5eb64681e8b22097b1789
	Library/metadata/40/403fa7f782732704daa3a43baf5a04cd
	Library/metadata/44/449b48f7eb5d87a4baaa5fb73f875a59
	Library/metadata/4f/4f4c1aa05c97b4141992b22f25afeb03
	Library/metadata/51/51f413747029ad3489e986b5163670de
	Library/metadata/5a/5a33ed72a8532eb429245444d28c630b
	Library/metadata/60/60bca8f58a0b8478e946e6e86658cb29
	Library/metadata/62/621a5c89ec432464fa3f9d4fb3dc9db5
	Library/metadata/66/66d24e77018cb9b4bbc30b7e4390c843
	Library/metadata/68/68ec2fe99d1108b9d0006a298d76c639
	Library/metadata/6c/6c8a8b1da1d88ea4faedcf86bc33bedb
	Library/metadata/7f/7f7850f24249e4056b2189de03ae584c
	Library/metadata/7f/7fa18f9ade4f2d349aa0cbd9f7b24991
	Library/metadata/81/814f6a7e3ec8a40aaa3a2057e2695924
	Library/metadata/81/81ec87d2c6dabc94fa5eb5d486771944
	Library/metadata/88/8846417901f4942d2a5fa9e32ce69d45
	Library/metadata/98/98f519f1210d92645baadc089d044637
	Library/metadata/99/991a8a5db4e71754aaa4a7436a2320ac
	Library/metadata/a8/a83ef4d7b189e3f44965bfd0061ab6b7
	Library/metadata/a9/a93bda1d6550334418dd32b81cab531f
	Library/metadata/af/af1a4ffa8139e0d4dacc81af24067546
	Library/metadata/b0/b086cdeff9ad5466ea2bbaf3aab66458
	Library/metadata/b8/b8810d278df41cf45948838dea7f121d
	Library/metadata/b9/b97e9c4901ab00c43a5ba45d2cff274c
	Library/metadata/bb/bb408dda5e1fcb14bb9b95b21079ed99
	Library/metadata/c0/c0d503575d866af40bc8acef28077aae
	Library/metadata/c3/c3b21e3bfd0fc495183d37d340826489
	Library/metadata/cf/cf5d7707264532044a9a9ac35257fd9b
	Library/metadata/d3/d3a0cd17d965be54bb23fa8e8be8e144
	Library/metadata/da/da93ddd6928094e24bb1f3f665f143d3
	Library/metadata/ef/ef73dad58880c4027a74be9c91fb039e
	Library/metadata/ff/ff40f921bfe66ed4893ecfcafebadff4