first parallel commit
Merge branch 'master' of github.com:sylafrs/phy into parallel

Conflicts:
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assets/SOUND/PlaysMidi.cs
	Assets/SOUND/sound.unity
	Library/InspectorExpandedItems.asset
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/guidmapper
	Library/metadata/ed/ed4b1e088b9212b42b662c51dba72839
	obj/Debug/Assembly-CSharp.dll
	obj/Debug/Assembly-CSharp.pdb
	obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	physique-csharp.sln
	physique-csharp.v11.suo
	physique.sln

Signed-off-by: sylafrs <sylaf@hotmail.fr>