nahazeni par spiritu do mapy
Merge branch 'master' of https://github.com/Woodbin/JackJumper

Conflicts:
	Assets/Scenes/nova_scena.unity
	Assets/Tiled2Unity/Prefabs/test_texturepack.prefab
	JackJumper-csharp.sln
	JackJumper.sln
	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/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/21/21d883e137315864f8caf8315466abfb
	Library/shadercompiler-1.log
pridana nova scena a dvere