-core implementado
Merge commit '8fbe0a60a0e4b8a608067ae7dafdb7a8a2077ced'

Conflicts:
	Assets/code/scenes/core.unity
	Assets/code/scripts/GameManager.cs
	Library/CurrentLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/45/4583d277666184d32b9ec86ba5b066bd
	Library/metadata/a7/a731fe1a8b5754ea484cd909067e8d59