commit1 mio :B
Merge branch 'master' of https://github.com/KariVillagran/Dracomonium_demo

Conflicts:
	Assembly-CSharp-Editor-vs.csproj
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assets/Scripts/c#/Gemas/cp_find_gema1.cs.meta
	Assets/Scripts/c#/Gemas/cp_find_gema2.cs.meta
	Assets/Scripts/c#/Gemas/cp_find_gema3.cs.meta
	Assets/Scripts/c#/Gemas/cp_find_gema4.cs.meta
	Assets/Scripts/c#/Gemas/cp_find_gema5.cs.meta
	Assets/Scripts/c#/Gemas/cp_find_gema6.cs.meta
	Library/CurrentLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript.dll
	Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/32/3283d4a066243ca469d30458bff58371
	Library/metadata/38/388dbb08faf53dc49888040d1e80ff06
	Library/metadata/3a/3a33ea7ee7bfd7c4985f2dc2257edbd2
	Library/metadata/40/40b3a28f8dc5bdf40961f18dd2ef57e1
	Library/metadata/4a/4af5d6e114dcba240b8ba674b62dbd97
	Library/metadata/73/734d812d601fcab48a0ebb49f926e455
	Library/metadata/b2/b2ac1ec5e5ee70245acf02eb9e0e5069
	Library/metadata/bd/bd17bab5dacf0bd41aca90ca9b5ad039
	Library/metadata/df/df5f732f222c00142a8da5972759ec7e
	Library/metadata/ef/ef23dda453f549d42836bddd6eec0412
	Library/metadata/fb/fbc02bdf223d925439843d2d0a3a02f2
	Library/shadercompiler-1.log